|
|
@@ -31,7 +31,7 @@ QUnit.assert.fail = function ( message ) {
|
|
|
|
|
|
QUnit.assert.numEqual = function ( actual, expected, message ) {
|
|
|
|
|
|
- var diff = Math.abs( actual - expected );
|
|
|
+ const diff = Math.abs( actual - expected );
|
|
|
message = message || ( actual + ' should be equal to ' + expected );
|
|
|
this.pushResult( {
|
|
|
result: diff < 0.1,
|
|
|
@@ -44,9 +44,9 @@ QUnit.assert.numEqual = function ( actual, expected, message ) {
|
|
|
|
|
|
QUnit.assert.equalKey = function ( obj, ref, key ) {
|
|
|
|
|
|
- var actual = obj[ key ];
|
|
|
- var expected = ref[ key ];
|
|
|
- var message = actual + ' should be equal to ' + expected + ' for key "' + key + '"';
|
|
|
+ const actual = obj[ key ];
|
|
|
+ const expected = ref[ key ];
|
|
|
+ const message = actual + ' should be equal to ' + expected + ' for key "' + key + '"';
|
|
|
this.pushResult( {
|
|
|
result: actual == expected,
|
|
|
actual: actual,
|
|
|
@@ -58,10 +58,10 @@ QUnit.assert.equalKey = function ( obj, ref, key ) {
|
|
|
|
|
|
QUnit.assert.smartEqual = function ( actual, expected, message ) {
|
|
|
|
|
|
- var cmp = new SmartComparer();
|
|
|
+ const cmp = new SmartComparer();
|
|
|
|
|
|
- var same = cmp.areEqual( actual, expected );
|
|
|
- var msg = cmp.getDiagnostic() || message;
|
|
|
+ const same = cmp.areEqual( actual, expected );
|
|
|
+ const msg = cmp.getDiagnostic() || message;
|
|
|
|
|
|
this.pushResult( {
|
|
|
result: same,
|
|
|
@@ -79,11 +79,11 @@ QUnit.assert.smartEqual = function ( actual, expected, message ) {
|
|
|
function checkGeometryClone( geom ) {
|
|
|
|
|
|
// Clone
|
|
|
- var copy = geom.clone();
|
|
|
+ const copy = geom.clone();
|
|
|
QUnit.assert.notEqual( copy.uuid, geom.uuid, 'clone uuid should differ from original' );
|
|
|
QUnit.assert.notEqual( copy.id, geom.id, 'clone id should differ from original' );
|
|
|
|
|
|
- var differingProp = getDifferingProp( geom, copy );
|
|
|
+ let differingProp = getDifferingProp( geom, copy );
|
|
|
QUnit.assert.ok( differingProp === undefined, 'properties are equal' );
|
|
|
|
|
|
differingProp = getDifferingProp( copy, geom );
|
|
|
@@ -96,14 +96,14 @@ function checkGeometryClone( geom ) {
|
|
|
|
|
|
function getDifferingProp( geometryA, geometryB ) {
|
|
|
|
|
|
- var geometryKeys = Object.keys( geometryA );
|
|
|
- var cloneKeys = Object.keys( geometryB );
|
|
|
+ const geometryKeys = Object.keys( geometryA );
|
|
|
+ const cloneKeys = Object.keys( geometryB );
|
|
|
|
|
|
- var differingProp = undefined;
|
|
|
+ let differingProp = undefined;
|
|
|
|
|
|
- for ( var i = 0, l = geometryKeys.length; i < l; i ++ ) {
|
|
|
+ for ( let i = 0, l = geometryKeys.length; i < l; i ++ ) {
|
|
|
|
|
|
- var key = geometryKeys[ i ];
|
|
|
+ const key = geometryKeys[ i ];
|
|
|
|
|
|
if ( cloneKeys.indexOf( key ) < 0 ) {
|
|
|
|
|
|
@@ -126,7 +126,7 @@ function checkGeometryJsonWriting( geom, json ) {
|
|
|
QUnit.assert.equalKey( geom, json, 'uuid' );
|
|
|
QUnit.assert.equal( json.id, undefined, 'should not persist id' );
|
|
|
|
|
|
- var params = geom.parameters;
|
|
|
+ const params = geom.parameters;
|
|
|
if ( ! params ) {
|
|
|
|
|
|
return;
|
|
|
@@ -134,8 +134,8 @@ function checkGeometryJsonWriting( geom, json ) {
|
|
|
}
|
|
|
|
|
|
// All parameters from geometry should be persisted.
|
|
|
- var keys = Object.keys( params );
|
|
|
- for ( var i = 0, l = keys.length; i < l; i ++ ) {
|
|
|
+ let keys = Object.keys( params );
|
|
|
+ for ( let i = 0, l = keys.length; i < l; i ++ ) {
|
|
|
|
|
|
QUnit.assert.equalKey( params, json, keys[ i ] );
|
|
|
|
|
|
@@ -143,11 +143,11 @@ function checkGeometryJsonWriting( geom, json ) {
|
|
|
|
|
|
// All parameters from json should be transfered to the geometry.
|
|
|
// json is flat. Ignore first level json properties that are not parameters.
|
|
|
- var notParameters = [ 'metadata', 'uuid', 'type' ];
|
|
|
- var keys = Object.keys( json );
|
|
|
- for ( var i = 0, l = keys.length; i < l; i ++ ) {
|
|
|
+ const notParameters = [ 'metadata', 'uuid', 'type' ];
|
|
|
+ keys = Object.keys( json );
|
|
|
+ for ( let i = 0, l = keys.length; i < l; i ++ ) {
|
|
|
|
|
|
- var key = keys[ i ];
|
|
|
+ const key = keys[ i ];
|
|
|
if ( notParameters.indexOf( key ) === - 1 ) QUnit.assert.equalKey( params, json, key );
|
|
|
|
|
|
}
|
|
|
@@ -157,18 +157,18 @@ function checkGeometryJsonWriting( geom, json ) {
|
|
|
// Check parsing and reconstruction of json geometry
|
|
|
function checkGeometryJsonReading( json, geom ) {
|
|
|
|
|
|
- var wrap = [ json ];
|
|
|
+ const wrap = [ json ];
|
|
|
|
|
|
- var loader = new ObjectLoader();
|
|
|
- var output = loader.parseGeometries( wrap );
|
|
|
+ const loader = new ObjectLoader();
|
|
|
+ const output = loader.parseGeometries( wrap );
|
|
|
|
|
|
QUnit.assert.ok( output[ geom.uuid ], 'geometry matching source uuid not in output' );
|
|
|
// QUnit.assert.smartEqual( output[ geom.uuid ], geom, 'Reconstruct geometry from ObjectLoader' );
|
|
|
|
|
|
- var differing = getDifferingProp( output[ geom.uuid ], geom );
|
|
|
+ const differing = getDifferingProp( output[ geom.uuid ], geom );
|
|
|
if ( differing ) console.log( differing );
|
|
|
|
|
|
- var differingProp = getDifferingProp( output[ geom.uuid ], geom );
|
|
|
+ let differingProp = getDifferingProp( output[ geom.uuid ], geom );
|
|
|
QUnit.assert.ok( differingProp === undefined, 'properties are equal' );
|
|
|
|
|
|
differingProp = getDifferingProp( geom, output[ geom.uuid ] );
|
|
|
@@ -179,7 +179,7 @@ function checkGeometryJsonReading( json, geom ) {
|
|
|
// Verify geom -> json -> geom
|
|
|
function checkGeometryJsonRoundtrip( geom ) {
|
|
|
|
|
|
- var json = geom.toJSON();
|
|
|
+ const json = geom.toJSON();
|
|
|
checkGeometryJsonWriting( geom, json );
|
|
|
checkGeometryJsonReading( json, geom );
|
|
|
|
|
|
@@ -189,9 +189,9 @@ function checkGeometryJsonRoundtrip( geom ) {
|
|
|
// Run common geometry tests.
|
|
|
function runStdGeometryTests( assert, geometries ) {
|
|
|
|
|
|
- for ( var i = 0, l = geometries.length; i < l; i ++ ) {
|
|
|
+ for ( let i = 0, l = geometries.length; i < l; i ++ ) {
|
|
|
|
|
|
- var geom = geometries[ i ];
|
|
|
+ const geom = geometries[ i ];
|
|
|
|
|
|
// Clone
|
|
|
checkGeometryClone( geom );
|
|
|
@@ -210,9 +210,9 @@ function runStdGeometryTests( assert, geometries ) {
|
|
|
// Run common light tests.
|
|
|
function runStdLightTests( assert, lights ) {
|
|
|
|
|
|
- for ( var i = 0, l = lights.length; i < l; i ++ ) {
|
|
|
+ for ( let i = 0, l = lights.length; i < l; i ++ ) {
|
|
|
|
|
|
- var light = lights[ i ];
|
|
|
+ const light = lights[ i ];
|
|
|
|
|
|
// copy and clone
|
|
|
checkLightCopyClone( assert, light );
|
|
|
@@ -233,7 +233,7 @@ function runStdLightTests( assert, lights ) {
|
|
|
function checkLightCopyClone( assert, light ) {
|
|
|
|
|
|
// copy
|
|
|
- var newLight = new light.constructor( 0xc0ffee );
|
|
|
+ const newLight = new light.constructor( 0xc0ffee );
|
|
|
newLight.copy( light );
|
|
|
|
|
|
QUnit.assert.notEqual( newLight.uuid, light.uuid, 'Copied light\'s UUID differs from original' );
|
|
|
@@ -247,7 +247,7 @@ function checkLightCopyClone( assert, light ) {
|
|
|
);
|
|
|
|
|
|
// Clone
|
|
|
- var clone = light.clone(); // better get a new var
|
|
|
+ const clone = light.clone(); // better get a new var
|
|
|
QUnit.assert.notEqual( clone.uuid, light.uuid, 'Cloned light\'s UUID differs from original' );
|
|
|
QUnit.assert.notEqual( clone.id, light.id, 'Clone light\'s id differs from original' );
|
|
|
QUnit.assert.smartEqual( clone, light, 'Clone light is equal to original' );
|
|
|
@@ -272,7 +272,7 @@ function checkLightJsonWriting( assert, light, json ) {
|
|
|
|
|
|
assert.equal( json.metadata.version, '4.5', 'check metadata version' );
|
|
|
|
|
|
- var object = json.object;
|
|
|
+ const object = json.object;
|
|
|
assert.equalKey( light, object, 'type' );
|
|
|
assert.equalKey( light, object, 'uuid' );
|
|
|
assert.equal( object.id, undefined, 'should not persist id' );
|
|
|
@@ -282,8 +282,8 @@ function checkLightJsonWriting( assert, light, json ) {
|
|
|
// Check parsing and reconstruction of json Light
|
|
|
function checkLightJsonReading( assert, json, light ) {
|
|
|
|
|
|
- var loader = new ObjectLoader();
|
|
|
- var outputLight = loader.parse( json );
|
|
|
+ const loader = new ObjectLoader();
|
|
|
+ const outputLight = loader.parse( json );
|
|
|
|
|
|
assert.smartEqual( outputLight, light, 'Reconstruct Light from ObjectLoader' );
|
|
|
|
|
|
@@ -292,7 +292,7 @@ function checkLightJsonReading( assert, json, light ) {
|
|
|
// Verify light -> json -> light
|
|
|
function checkLightJsonRoundtrip( assert, light ) {
|
|
|
|
|
|
- var json = light.toJSON();
|
|
|
+ const json = light.toJSON();
|
|
|
checkLightJsonWriting( assert, light, json );
|
|
|
checkLightJsonReading( assert, json, light );
|
|
|
|
Michael Herzog