浏览代码

Merge pull request #13607 from delftswa2018/euler-test-fix

Changed Euler Copy Clone on change test implementation.
Mr.doob 7 年之前
父节点
当前提交
dccdd1dbd6
共有 1 个文件被更改,包括 19 次插入15 次删除
  1. 19 15
      test/unit/src/math/Euler.tests.js

+ 19 - 15
test/unit/src/math/Euler.tests.js

@@ -208,9 +208,6 @@ export default QUnit.module( 'Maths', () => {
 
 
 			} );
 			} );
 
 
-			assert.expect( 8 );
-
-			// should be 4 calls to onChangeCallback
 			a.x = 1;
 			a.x = 1;
 			a.y = 2;
 			a.y = 2;
 			a.z = 3;
 			a.z = 3;
@@ -221,31 +218,38 @@ export default QUnit.module( 'Maths', () => {
 			assert.strictEqual( a.z, 3, "get: check z" );
 			assert.strictEqual( a.z, 3, "get: check z" );
 			assert.strictEqual( a.order, "ZYX", "get: check order" );
 			assert.strictEqual( a.order, "ZYX", "get: check order" );
 
 
+			assert.verifySteps( Array( 4 ).fill( "set: onChange called" ) );
+
 		} );
 		} );
 
 
 		QUnit.test( "clone/copy, check callbacks", ( assert ) => {
 		QUnit.test( "clone/copy, check callbacks", ( assert ) => {
 
 
-			assert.expect( 3 );
-
 			var a = new Euler( 1, 2, 3, "ZXY" );
 			var a = new Euler( 1, 2, 3, "ZXY" );
 			var b = new Euler( 4, 5, 6, "XZY" );
 			var b = new Euler( 4, 5, 6, "XZY" );
-			var cb = function () {
+			var cbSucceed = function () {
 
 
+				assert.ok( true );
 				assert.step( "onChange called" );
 				assert.step( "onChange called" );
 
 
 			};
 			};
-			a.onChange( cb );
-			b.onChange( cb );
+			var cbFail = function () {
+
+				assert.ok( false );
+
+			};
+			a.onChange( cbFail );
+			b.onChange( cbFail );
 
 
 			// clone doesn't trigger onChange
 			// clone doesn't trigger onChange
-			var a = b.clone();
+			a = b.clone();
 			assert.ok( a.equals( b ), "clone: check if a equals b" );
 			assert.ok( a.equals( b ), "clone: check if a equals b" );
 
 
 			// copy triggers onChange once
 			// copy triggers onChange once
-			var a = new Euler( 1, 2, 3, "ZXY" );
-			a.onChange( cb );
+			a = new Euler( 1, 2, 3, "ZXY" );
+			a.onChange( cbSucceed );
 			a.copy( b );
 			a.copy( b );
 			assert.ok( a.equals( b ), "copy: check if a equals b" );
 			assert.ok( a.equals( b ), "copy: check if a equals b" );
+			assert.verifySteps( [ "onChange called" ] );
 
 
 		} );
 		} );
 
 
@@ -279,8 +283,6 @@ export default QUnit.module( 'Maths', () => {
 
 
 		QUnit.test( "fromArray", ( assert ) => {
 		QUnit.test( "fromArray", ( assert ) => {
 
 
-			assert.expect( 10 );
-
 			var a = new Euler();
 			var a = new Euler();
 			var array = [ x, y, z ];
 			var array = [ x, y, z ];
 			var cb = function () {
 			var cb = function () {
@@ -296,8 +298,8 @@ export default QUnit.module( 'Maths', () => {
 			assert.strictEqual( a.z, z, "No order: check z" );
 			assert.strictEqual( a.z, z, "No order: check z" );
 			assert.strictEqual( a.order, "XYZ", "No order: check order" );
 			assert.strictEqual( a.order, "XYZ", "No order: check order" );
 
 
-			var a = new Euler();
-			var array = [ x, y, z, "ZXY" ];
+			a = new Euler();
+			array = [ x, y, z, "ZXY" ];
 			a.onChange( cb );
 			a.onChange( cb );
 			a.fromArray( array );
 			a.fromArray( array );
 			assert.strictEqual( a.x, x, "With order: check x" );
 			assert.strictEqual( a.x, x, "With order: check x" );
@@ -305,6 +307,8 @@ export default QUnit.module( 'Maths', () => {
 			assert.strictEqual( a.z, z, "With order: check z" );
 			assert.strictEqual( a.z, z, "With order: check z" );
 			assert.strictEqual( a.order, "ZXY", "With order: check order" );
 			assert.strictEqual( a.order, "ZXY", "With order: check order" );
 
 
+			assert.verifySteps( Array( 2 ).fill( "onChange called" ) );
+
 		} );
 		} );
 
 
 		QUnit.todo( "onChange", ( assert ) => {
 		QUnit.todo( "onChange", ( assert ) => {