[#25] Refactored common MemberBuilder validator call assertion logic into a common module
Mike Gerwitz
parent
e809c10dfe
commit
cb6c4af763
|
|
@ -22,6 +22,8 @@
|
||||||
* @package test
|
* @package test
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
var shared = require( __dirname + '/inc-common' );
|
||||||
|
|
||||||
require( 'common' ).testCase(
|
require( 'common' ).testCase(
|
||||||
{
|
{
|
||||||
caseSetUp: function()
|
caseSetUp: function()
|
||||||
|
|
@ -30,45 +32,28 @@ require( 'common' ).testCase(
|
||||||
|
|
||||||
this.testArgs = function( args, name, value, keywords )
|
this.testArgs = function( args, name, value, keywords )
|
||||||
{
|
{
|
||||||
var pub = _self.members[ 'public' ],
|
shared.testArgs( _self, args, name, value, keywords, function(
|
||||||
|
prev_default, pval_given, pkey_given
|
||||||
// prev data
|
)
|
||||||
pval_expect = null,
|
|
||||||
pkeywords_expect = null,
|
|
||||||
pval_given = null,
|
|
||||||
pkeywords_given = null
|
|
||||||
;
|
|
||||||
|
|
||||||
if ( pub[ name ] )
|
|
||||||
{
|
{
|
||||||
pval_expect = pub[ name ];
|
var expected = _self.members[ 'public' ][ name ];
|
||||||
pkeywords_expect = pval_expect.___$$keywords$$; // XXX
|
|
||||||
|
|
||||||
pval_given = args[ 3 ].member;
|
if ( !expected )
|
||||||
pkeywords_given = args[ 4 ];
|
{
|
||||||
|
return prev_default;
|
||||||
}
|
}
|
||||||
|
|
||||||
_self.assertEqual( name, args[ 0 ],
|
return {
|
||||||
'Incorrect name passed to method validator'
|
value: {
|
||||||
);
|
expected: expected,
|
||||||
|
given: pval_given.member,
|
||||||
_self.assertStrictEqual( value, args[ 1 ],
|
},
|
||||||
'Incorrect value passed to method validator'
|
keywords: {
|
||||||
);
|
expected: expected.___$$keywords$$, // XXX
|
||||||
|
given: pkey_given,
|
||||||
_self.assertStrictEqual( keywords, args[ 2 ],
|
},
|
||||||
'Incorrect keywords passed to method validator'
|
};
|
||||||
);
|
} );
|
||||||
|
|
||||||
_self.assertStrictEqual( pval_expect, pval_given,
|
|
||||||
'Previous data should contain prev value if overriding, ' +
|
|
||||||
'otherwise null'
|
|
||||||
);
|
|
||||||
|
|
||||||
_self.assertStrictEqual( pkeywords_expect, pkeywords_given,
|
|
||||||
'Previous keywords should contain prev keyword if ' +
|
|
||||||
'overriding, otherwise null'
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,8 @@
|
||||||
* @package test
|
* @package test
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
var shared = require( __dirname + '/inc-common' );
|
||||||
|
|
||||||
require( 'common' ).testCase(
|
require( 'common' ).testCase(
|
||||||
{
|
{
|
||||||
caseSetUp: function()
|
caseSetUp: function()
|
||||||
|
|
@ -30,45 +32,28 @@ require( 'common' ).testCase(
|
||||||
|
|
||||||
this.testArgs = function( args, name, value, keywords )
|
this.testArgs = function( args, name, value, keywords )
|
||||||
{
|
{
|
||||||
var pub = _self.members[ 'public' ],
|
shared.testArgs( _self, args, name, value, keywords, function(
|
||||||
|
prev_default, pval_given, pkey_given
|
||||||
// prev data
|
)
|
||||||
pval_expect = null,
|
|
||||||
pkeywords_expect = null,
|
|
||||||
pval_given = null,
|
|
||||||
pkeywords_given = null
|
|
||||||
;
|
|
||||||
|
|
||||||
if ( pub[ name ] )
|
|
||||||
{
|
{
|
||||||
pval_expect = pub[ name ][ 0 ];
|
var expected = _self.members[ 'public' ][ name ];
|
||||||
pkeywords_expect = pub[ name ][ 1 ];
|
|
||||||
|
|
||||||
pval_given = args[ 3 ].member[ 0 ];
|
if ( !expected )
|
||||||
pkeywords_given = args[ 4 ];
|
{
|
||||||
|
return prev_default;
|
||||||
}
|
}
|
||||||
|
|
||||||
_self.assertEqual( name, args[ 0 ],
|
return {
|
||||||
'Incorrect name passed to property validator'
|
value: {
|
||||||
);
|
expected: expected[ 0 ],
|
||||||
|
given: pval_given.member[ 0 ],
|
||||||
_self.assertStrictEqual( value, args[ 1 ],
|
},
|
||||||
'Incorrect value passed to property validator'
|
keywords: {
|
||||||
);
|
expected: expected[ 1 ],
|
||||||
|
given: pkey_given,
|
||||||
_self.assertStrictEqual( keywords, args[ 2 ],
|
},
|
||||||
'Incorrect keywords passed to property validator'
|
};
|
||||||
);
|
} );
|
||||||
|
|
||||||
_self.assertStrictEqual( pval_expect, pval_given,
|
|
||||||
'Previous data should contain prev value if overriding, ' +
|
|
||||||
'otherwise null'
|
|
||||||
);
|
|
||||||
|
|
||||||
_self.assertStrictEqual( pkeywords_expect, pkeywords_given,
|
|
||||||
'Previous keywords should contain prev keyword if ' +
|
|
||||||
'overriding, otherwise null'
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
/**
|
||||||
|
* Shared functions for MemberBuilder tests
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Mike Gerwitz
|
||||||
|
*
|
||||||
|
* This file is part of ease.js.
|
||||||
|
*
|
||||||
|
* ease.js is free software: you can redistribute it and/or modify it under the
|
||||||
|
* terms of the GNU Lesser General Public License as published by the Free
|
||||||
|
* Software Foundation, either version 3 of the License, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
|
||||||
|
* for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* @author Mike Gerwitz
|
||||||
|
* @package test
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform common assertions on validator arguments
|
||||||
|
*
|
||||||
|
* @param {Object} testcase test case being executed
|
||||||
|
* @param {arguments} args arguments to check
|
||||||
|
* @param {string} name member name
|
||||||
|
* @param {*} value expected value
|
||||||
|
* @param {Object} keywords expected keywords
|
||||||
|
* @param {function()} prevLookup function to use to look up prev member data
|
||||||
|
*
|
||||||
|
* @return {undefined}
|
||||||
|
*/
|
||||||
|
exports.testArgs = function( testcase, args, name, value, keywords, prevLookup )
|
||||||
|
{
|
||||||
|
var prev = {
|
||||||
|
value: { expected: null, given: args[ 3 ] },
|
||||||
|
keywords: { expected: null, given: args[ 4 ] },
|
||||||
|
};
|
||||||
|
|
||||||
|
prev = prevLookup( prev, prev.value.given, prev.keywords.given );
|
||||||
|
|
||||||
|
testcase.assertEqual( name, args[ 0 ],
|
||||||
|
'Incorrect name passed to validator'
|
||||||
|
);
|
||||||
|
|
||||||
|
testcase.assertStrictEqual( value, args[ 1 ],
|
||||||
|
'Incorrect value passed to validator'
|
||||||
|
);
|
||||||
|
|
||||||
|
testcase.assertStrictEqual( keywords, args[ 2 ],
|
||||||
|
'Incorrect keywords passed to validator'
|
||||||
|
);
|
||||||
|
|
||||||
|
testcase.assertStrictEqual( prev.value.expected, prev.value.given,
|
||||||
|
'Previous data should contain prev value if overriding, ' +
|
||||||
|
'otherwise null'
|
||||||
|
);
|
||||||
|
|
||||||
|
testcase.assertStrictEqual( prev.keywords.expected, prev.keywords.given,
|
||||||
|
'Previous keywords should contain prev keyword if ' +
|
||||||
|
'overriding, otherwise null'
|
||||||
|
);
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue