Skip to content

Commit 284b70b

Browse files
mramatomramato
authored
Merge pull request #7807 from AnalyticalGraphicsInc/testCleanup
Test code cleanup.
2 parents f84594a + ea90bf9 commit 284b70b

22 files changed

+108
-94
lines changed

‎Specs/Core/CesiumTerrainProviderSpec.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ defineSuite([
194194
return pollToPromise(function() {
195195
return provider.ready;
196196
}).then(function() {
197-
var tilingScheme = provider.tilingScheme;
198-
expect(tilingScheme instanceof GeographicTilingScheme).toBe(true);
197+
expect(provider.tilingScheme).toBeInstanceOf(GeographicTilingScheme);
199198
});
200199
});
201200

‎Specs/Core/ColorSpec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,17 @@ defineSuite([
103103

104104
it('clone with no parameters returns a new identical copy.', function() {
105105
var v = new Color(0.1, 0.2, 0.3, 0.4);
106-
var v2 = v.clone();
107-
expect(v).toEqual(v2);
108-
expect(v === v2).toEqual(false);
106+
var clone = v.clone();
107+
expect(clone).toEqual(v);
108+
expect(clone).not.toBe(v);
109109
});
110110

111111
it('clone with a parameter modifies the parameter.', function() {
112112
var v = new Color(0.1, 0.2, 0.3, 0.4);
113113
var v2 = new Color();
114-
var v3 = v.clone(v2);
115-
expect(v).toEqual(v2);
116-
expect(v3 === v2).toEqual(true);
114+
var clone = v.clone(v2);
115+
expect(clone).toEqual(v2);
116+
expect(clone).toBe(v2);
117117
});
118118

119119
it('equals works', function() {

‎Specs/Core/EllipsoidSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ defineSuite([
411411
};
412412

413413
var cloned = Ellipsoid.clone(myEllipsoid);
414-
expect(cloned instanceof Ellipsoid).toBe(true);
414+
expect(cloned).toBeInstanceOf(Ellipsoid);
415415
expect(cloned).toEqual(myEllipsoid);
416416
});
417417

@@ -460,7 +460,7 @@ defineSuite([
460460
var cartographic = Cartographic.fromDegrees(35.23,33.23);
461461
var cartesianOnTheSurface = ellipsoid.cartographicToCartesian(cartographic);
462462
var returnedResult = ellipsoid.getSurfaceNormalIntersectionWithZAxis(cartesianOnTheSurface);
463-
expect(returnedResult instanceof Cartesian3).toBe(true);
463+
expect(returnedResult).toBeInstanceOf(Cartesian3);
464464
});
465465

466466
it('getSurfaceNormalIntersectionWithZAxis works with a result parameter', function() {

‎Specs/Core/GoogleEarthEnterpriseTerrainProviderSpec.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ defineSuite([
141141
return pollToPromise(function() {
142142
return terrainProvider.ready;
143143
}).then(function() {
144-
var tilingScheme = terrainProvider.tilingScheme;
145-
expect(tilingScheme instanceof GeographicTilingScheme).toBe(true);
144+
expect(terrainProvider.tilingScheme).toBeInstanceOf(GeographicTilingScheme);
146145
});
147146
});
148147

‎Specs/Core/GroundPolylineGeometrySpec.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ defineSuite([
112112

113113
// Expect rightNormalAndTextureCoordinateNormalizationY and texcoordNormalization2D.y to encode if the vertex is on the bottom
114114
values = rightNormalAndTextureCoordinateNormalizationY.values;
115-
expect(values[3] > 1.0).toBe(true);
116-
expect(values[1 * 4 + 3] > 1.0).toBe(true);
117-
expect(values[4 * 4 + 3] > 1.0).toBe(true);
118-
expect(values[5 * 4 + 3] > 1.0).toBe(true);
115+
expect(values[3]).toBeGreaterThan(1.0);
116+
expect(values[1 * 4 + 3]).toBeGreaterThan(1.0);
117+
expect(values[4 * 4 + 3]).toBeGreaterThan(1.0);
118+
expect(values[5 * 4 + 3]).toBeGreaterThan(1.0);
119119

120120
values = texcoordNormalization2D.values;
121-
expect(values[1] > 1.0).toBe(true);
122-
expect(values[1 * 2 + 1] > 1.0).toBe(true);
123-
expect(values[4 * 2 + 1] > 1.0).toBe(true);
124-
expect(values[5 * 2 + 1] > 1.0).toBe(true);
121+
expect(values[1]).toBeGreaterThan(1.0);
122+
expect(values[1 * 2 + 1]).toBeGreaterThan(1.0);
123+
expect(values[4 * 2 + 1]).toBeGreaterThan(1.0);
124+
expect(values[5 * 2 + 1]).toBeGreaterThan(1.0);
125125

126126
// Line segment geometry is encoded as:
127127
// - start position
@@ -635,8 +635,8 @@ defineSuite([
635635
var boundingSphere = geometry.boundingSphere;
636636
var pointsDistance = Cartesian3.distance(positions[0], positions[1]);
637637

638-
expect(boundingSphere.radius > pointsDistance).toBe(true);
639-
expect(boundingSphere.radius > 1000.0).toBe(true); // starting top/bottom height
638+
expect(boundingSphere.radius).toBeGreaterThan(pointsDistance);
639+
expect(boundingSphere.radius).toBeGreaterThan(1000.0); // starting top/bottom height
640640
});
641641

642642
var packedInstance = [positions.length];

‎Specs/Core/HeapSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ defineSuite([
6868
pass = pass && checkHeap(heap, comparator);
6969
}
7070
expect(pass).toBe(true);
71-
expect(heap.length <= heap.maximumLength).toBe(true);
71+
expect(heap.length).toBeLessThanOrEqualTo(heap.maximumLength);
7272
// allowed one extra slot for swapping
7373
expect(heap.internalArray.length).toBeLessThanOrEqualTo(heap.maximumLength + 1);
7474
});

‎Specs/Core/ResourceSpec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ defineSuite([
12281228
}).then(function(loadedImage) {
12291229
expect(loadedImage.width).toEqual(1);
12301230
expect(loadedImage.height).toEqual(1);
1231-
expect(loadedImage instanceof ImageBitmap);
1231+
expect(loadedImage).toBeInstanceOf(ImageBitmap);
12321232
});
12331233
});
12341234

@@ -1766,7 +1766,7 @@ defineSuite([
17661766
}).then(function() {
17671767
fail('expected promise to reject');
17681768
}).otherwise(function(err) {
1769-
expect(err instanceof RequestErrorEvent).toBe(true);
1769+
expect(err).toBeInstanceOf(RequestErrorEvent);
17701770
});
17711771
});
17721772

@@ -1778,7 +1778,7 @@ defineSuite([
17781778
fail('expected promise to reject');
17791779
}).otherwise(function(err) {
17801780
expect(err).toBeDefined();
1781-
expect(err instanceof Error).toBe(true);
1781+
expect(err).toBeInstanceOf(Error);
17821782
});
17831783
});
17841784
});
@@ -1865,7 +1865,7 @@ defineSuite([
18651865

18661866
fakeXHR.simulateError();
18671867
expect(resolvedValue).toBeUndefined();
1868-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
1868+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
18691869
});
18701870

18711871
it('results in an HTTP status code less than 200', function() {
@@ -1888,7 +1888,7 @@ defineSuite([
18881888

18891889
fakeXHR.simulateHttpResponse(199);
18901890
expect(resolvedValue).toBeUndefined();
1891-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
1891+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
18921892
});
18931893

18941894
it('resolves undefined for status code 204', function() {
@@ -2061,7 +2061,7 @@ defineSuite([
20612061

20622062
fakeXHR.simulateError(); // This fails because we only retry once
20632063
expect(resolvedValue).toBeUndefined();
2064-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
2064+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
20652065
});
20662066

20672067
it('rejects after callback returns false', function() {
@@ -2090,7 +2090,7 @@ defineSuite([
20902090

20912091
fakeXHR.simulateError(); // This fails because the callback returns false
20922092
expect(resolvedValue).toBeUndefined();
2093-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
2093+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
20942094

20952095
expect(cb.calls.count()).toEqual(1);
20962096
var receivedResource = cb.calls.argsFor(0)[0];

‎Specs/Core/SphericalSpec.js

+19-18
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,23 @@ defineSuite([
5050

5151
it('Cloning with no result parameter returns a new instance.', function() {
5252
var v = new Spherical(1, 2, 3);
53-
var w = v.clone();
54-
expect(v === w).toEqual(false);
55-
expect(v).toEqual(w);
53+
var clone = v.clone();
54+
expect(clone).not.toBe(v);
55+
expect(clone).toBeInstanceOf(Spherical);
56+
expect(clone).toEqual(v);
5657
});
5758

5859
it('Cloning with result modifies existing instance and returns it.', function() {
5960
var v = new Spherical(1, 2, 3);
6061
var w = new NotSpherical();
6162
expect(NotSpherical.areEqual(v, w)).toEqual(false);
62-
var q = v.clone(w);
63-
expect(v === w).toEqual(false);
64-
expect(q === w).toEqual(true);
63+
var clone = v.clone(w);
64+
expect(clone).not.toBe(v);
65+
expect(clone).toBe(w);
6566
expect(NotSpherical.areEqual(v, w)).toEqual(true);
6667
});
6768

68-
it('Normalizing with no result parameter creates new instance and sets magntitude to 1.0', function() {
69+
it('Normalizing with no result parameter creates new instance and sets magnitude to 1.0', function() {
6970
var v = new Spherical(0, 2, 3);
7071
var w = Spherical.normalize(v);
7172
expect(w).not.toEqual(v);
@@ -74,24 +75,24 @@ defineSuite([
7475
expect(w.magnitude).toEqual(1);
7576
});
7677

77-
it('Normalizing with result parameter modifies instance and sets magntitude to 1.0', function() {
78+
it('Normalizing with result parameter modifies instance and sets magnitude to 1.0', function() {
7879
var v = new Spherical(0, 2, 3);
7980
var w = new NotSpherical();
8081
var q = Spherical.normalize(v, w);
81-
expect(w).not.toEqual(v);
82-
expect(w === q).toEqual(true);
83-
expect(w.clock).toEqual(0);
84-
expect(w.cone).toEqual(2);
85-
expect(w.magnitude).toEqual(1);
82+
expect(q).not.toEqual(v);
83+
expect(q).toBe(w);
84+
expect(q.clock).toEqual(0);
85+
expect(q.cone).toEqual(2);
86+
expect(q.magnitude).toEqual(1);
8687
});
8788

88-
it('Normalizing with this as result parameter modifies instance and sets magntitude to 1.0', function() {
89+
it('Normalizing with this as result parameter modifies instance and sets magnitude to 1.0', function() {
8990
var v = new Spherical(0, 2, 3);
9091
var q = Spherical.normalize(v, v);
91-
expect(v === q).toEqual(true);
92-
expect(v.clock).toEqual(0);
93-
expect(v.cone).toEqual(2);
94-
expect(v.magnitude).toEqual(1);
92+
expect(q).toBe(v);
93+
expect(q.clock).toEqual(0);
94+
expect(q.cone).toEqual(2);
95+
expect(q.magnitude).toEqual(1);
9596
});
9697

9798
it('equalsEpsilon returns true for expected values.', function() {

‎Specs/Core/VRTheWorldTerrainProviderSpec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ defineSuite([
256256
return pollToPromise(function() {
257257
return terrainProvider.ready;
258258
}).then(function() {
259-
expect(terrainProvider.tilingScheme instanceof GeographicTilingScheme).toBe(true);
260-
return terrainProvider.requestTileGeometry(0, 0, 0).then(function(loadedData) {
261-
expect(loadedData).toBeInstanceOf(HeightmapTerrainData);
262-
});
259+
expect(terrainProvider.tilingScheme).toBeInstanceOf(GeographicTilingScheme);
260+
return terrainProvider.requestTileGeometry(0, 0, 0);
261+
}).then(function(loadedData) {
262+
expect(loadedData).toBeInstanceOf(HeightmapTerrainData);
263263
});
264264
});
265265

‎Specs/Core/VertexFormatSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defineSuite([
1212
normal : true
1313
});
1414
var cloned = VertexFormat.clone(vertexFormat);
15-
expect(cloned instanceof VertexFormat).toBe(true);
15+
expect(cloned).toBeInstanceOf(VertexFormat);
1616
expect(cloned).toEqual(vertexFormat);
1717
});
1818

‎Specs/Core/loadCRNSpec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ defineSuite([
9393

9494
fakeXHR.simulateError();
9595
expect(resolvedValue).toBeUndefined();
96-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
96+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
9797
expect(rejectedError.statusCode).toBeUndefined();
9898
expect(rejectedError.response).toBeUndefined();
9999
});
@@ -118,7 +118,7 @@ defineSuite([
118118
var error = 'some error';
119119
fakeXHR.simulateHttpResponse(404, error);
120120
expect(resolvedValue).toBeUndefined();
121-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
121+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
122122
expect(rejectedError.statusCode).toEqual(404);
123123
expect(rejectedError.response).toEqual(error);
124124
});

‎Specs/Core/loadKTXSpec.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ defineSuite([
7979

8080
fakeXHR.simulateError();
8181
expect(resolvedValue).toBeUndefined();
82-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
82+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
8383
expect(rejectedError.statusCode).toBeUndefined();
8484
expect(rejectedError.response).toBeUndefined();
8585
});
@@ -104,7 +104,7 @@ defineSuite([
104104
var error = 'some error';
105105
fakeXHR.simulateHttpResponse(404, error);
106106
expect(resolvedValue).toBeUndefined();
107-
expect(rejectedError instanceof RequestErrorEvent).toBe(true);
107+
expect(rejectedError).toBeInstanceOf(RequestErrorEvent);
108108
expect(rejectedError.statusCode).toEqual(404);
109109
expect(rejectedError.response).toEqual(error);
110110
});
@@ -259,7 +259,7 @@ defineSuite([
259259
});
260260

261261
expect(resolvedValue).toBeUndefined();
262-
expect(rejectedError instanceof RuntimeError).toEqual(true);
262+
expect(rejectedError).toBeInstanceOf(RuntimeError);
263263
expect(rejectedError.message).toEqual('Invalid KTX file.');
264264
});
265265

@@ -279,7 +279,7 @@ defineSuite([
279279
});
280280

281281
expect(resolvedValue).toBeUndefined();
282-
expect(rejectedError instanceof RuntimeError).toEqual(true);
282+
expect(rejectedError).toBeInstanceOf(RuntimeError);
283283
expect(rejectedError.message).toEqual('File is the wrong endianness.');
284284
});
285285

@@ -299,7 +299,7 @@ defineSuite([
299299
});
300300

301301
expect(resolvedValue).toBeUndefined();
302-
expect(rejectedError instanceof RuntimeError).toEqual(true);
302+
expect(rejectedError).toBeInstanceOf(RuntimeError);
303303
expect(rejectedError.message).toEqual('glInternalFormat is not a valid format.');
304304
});
305305

@@ -319,7 +319,7 @@ defineSuite([
319319
});
320320

321321
expect(resolvedValue).toBeUndefined();
322-
expect(rejectedError instanceof RuntimeError).toEqual(true);
322+
expect(rejectedError).toBeInstanceOf(RuntimeError);
323323
expect(rejectedError.message).toEqual('glType must be zero when the texture is compressed.');
324324
});
325325

@@ -339,7 +339,7 @@ defineSuite([
339339
});
340340

341341
expect(resolvedValue).toBeUndefined();
342-
expect(rejectedError instanceof RuntimeError).toEqual(true);
342+
expect(rejectedError).toBeInstanceOf(RuntimeError);
343343
expect(rejectedError.message).toEqual('The type size for compressed textures must be 1.');
344344
});
345345

@@ -359,7 +359,7 @@ defineSuite([
359359
});
360360

361361
expect(resolvedValue).toBeUndefined();
362-
expect(rejectedError instanceof RuntimeError).toEqual(true);
362+
expect(rejectedError).toBeInstanceOf(RuntimeError);
363363
expect(rejectedError.message).toEqual('The base internal format must be the same as the format for uncompressed textures.');
364364
});
365365

@@ -379,7 +379,7 @@ defineSuite([
379379
});
380380

381381
expect(resolvedValue).toBeUndefined();
382-
expect(rejectedError instanceof RuntimeError).toEqual(true);
382+
expect(rejectedError).toBeInstanceOf(RuntimeError);
383383
expect(rejectedError.message).toEqual('3D textures are unsupported.');
384384
});
385385

@@ -399,7 +399,7 @@ defineSuite([
399399
});
400400

401401
expect(resolvedValue).toBeUndefined();
402-
expect(rejectedError instanceof RuntimeError).toEqual(true);
402+
expect(rejectedError).toBeInstanceOf(RuntimeError);
403403
expect(rejectedError.message).toEqual('Texture arrays are unsupported.');
404404
});
405405

0 commit comments

Comments
 (0)