From e385a9c8fb541570a1e39c672ccf064ef07f1496 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Tue, 6 Dec 2011 18:26:28 -0500 Subject: [PATCH] MemberBuilderValidator tests now properly wrap certain functions (they were working, but let's be safe) --- test/MemberBuilderValidator/GetterSetterTest.js | 5 ++++- test/MemberBuilderValidator/MethodTest.js | 5 ++++- test/MemberBuilderValidator/PropertyTest.js | 5 ++++- test/MemberBuilderValidator/inc-common.js | 10 ++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/test/MemberBuilderValidator/GetterSetterTest.js b/test/MemberBuilderValidator/GetterSetterTest.js index 7493b9c..54fb702 100644 --- a/test/MemberBuilderValidator/GetterSetterTest.js +++ b/test/MemberBuilderValidator/GetterSetterTest.js @@ -33,7 +33,10 @@ require( 'common' ).testCase( { var _self = this; - this.quickFailureTest = shared.quickFailureTest; + this.quickFailureTest = function() + { + shared.quickFailureTest.apply( _self, arguments ); + }; this.quickVisChangeTest = function( start, override, failtest, failstr ) { diff --git a/test/MemberBuilderValidator/MethodTest.js b/test/MemberBuilderValidator/MethodTest.js index bdc3f9f..c1cea30 100644 --- a/test/MemberBuilderValidator/MethodTest.js +++ b/test/MemberBuilderValidator/MethodTest.js @@ -39,7 +39,10 @@ require( 'common' ).testCase( }; - this.quickFailureTest = shared.quickFailureTest; + this.quickFailureTest = function() + { + shared.quickFailureTest.apply( _self, arguments ); + }; this.quickVisChangeTest = function( start, override, failtest, failstr ) diff --git a/test/MemberBuilderValidator/PropertyTest.js b/test/MemberBuilderValidator/PropertyTest.js index 22f3f96..2f37825 100644 --- a/test/MemberBuilderValidator/PropertyTest.js +++ b/test/MemberBuilderValidator/PropertyTest.js @@ -31,7 +31,10 @@ require( 'common' ).testCase( { var _self = this; - this.quickFailureTest = shared.quickFailureTest; + this.quickFailureTest = function() + { + shared.quickFailureTest.apply( _self, arguments ); + }; this.quickKeywordPropTest = function( keywords, identifier, prev ) { diff --git a/test/MemberBuilderValidator/inc-common.js b/test/MemberBuilderValidator/inc-common.js index 8b33a3e..9526140 100644 --- a/test/MemberBuilderValidator/inc-common.js +++ b/test/MemberBuilderValidator/inc-common.js @@ -119,11 +119,11 @@ exports.quickKeywordTest = function( type, keywords, identifier, prev ) if ( identifier ) { - _self.quickFailureTest( name, identifier, testfunc ); + this.quickFailureTest.call( this, name, identifier, testfunc ); } else { - _self.assertDoesNotThrow( testfunc, Error ); + this.assertDoesNotThrow( testfunc, Error ); } }; @@ -206,11 +206,13 @@ exports.quickVisChangeTest = function( if ( failtest ) { - this.quickFailureTest( name, ( failstr || 'de-escalate' ), testfun ); + this.quickFailureTest.call( this, + name, ( failstr || 'de-escalate' ), testfun + ); } else { - _self.assertDoesNotThrow( testfun, Error ); + this.assertDoesNotThrow( testfun, Error ); } };