From dae243eb7a9000d89e89921758ad21d710aca438 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Tue, 27 Dec 2011 13:54:22 +0000 Subject: [PATCH] Fix: fnRender unit tests need to be updated for the change to the second argument being passed --- .../tests_onhold/1_dom/aoColumns.fnRender.js | 9 +++++---- .../unit_testing/tests_onhold/2_js/aoColumns.fnRender.js | 7 ++++--- .../tests_onhold/3_ajax/aoColumns.fnRender.js | 7 ++++--- .../tests_onhold/4_server-side/aoColumns.fnRender.js | 7 ++++--- .../tests_onhold/5_ajax_objects/aoColumns.fnRender.js | 7 ++++--- .../6_delayed_rendering/aoColumns.fnRender.js | 7 ++++--- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/media/unit_testing/tests_onhold/1_dom/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/1_dom/aoColumns.fnRender.js index 9c3239b5..8060ddb8 100755 --- a/media/unit_testing/tests_onhold/1_dom/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/1_dom/aoColumns.fnRender.js @@ -25,16 +25,17 @@ $(document).ready( function () { ); oTest.fnTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); oTable = $('#example').dataTable( { "aoColumns": [ null, - { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + { "fnRender": function (a, v) { + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; } diff --git a/media/unit_testing/tests_onhold/2_js/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/2_js/aoColumns.fnRender.js index 2a96e014..cb89aeb9 100755 --- a/media/unit_testing/tests_onhold/2_js/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/2_js/aoColumns.fnRender.js @@ -26,7 +26,7 @@ $(document).ready( function () { ); oTest.fnTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); @@ -35,8 +35,9 @@ $(document).ready( function () { "aoColumns": [ null, { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; } diff --git a/media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js index c60f7bd4..ca6f6011 100755 --- a/media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/3_ajax/aoColumns.fnRender.js @@ -26,7 +26,7 @@ $(document).ready( function () { ); oTest.fnWaitTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); @@ -35,8 +35,9 @@ $(document).ready( function () { "aoColumns": [ null, { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; } diff --git a/media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js index 899299fe..4481b75c 100755 --- a/media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/4_server-side/aoColumns.fnRender.js @@ -27,7 +27,7 @@ $(document).ready( function () { ); oTest.fnWaitTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); @@ -37,8 +37,9 @@ $(document).ready( function () { "aoColumns": [ null, { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; } diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js index 3eaa68b1..9d06e8e3 100755 --- a/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/aoColumns.fnRender.js @@ -29,7 +29,7 @@ $(document).ready( function () { ); oTest.fnWaitTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); @@ -39,8 +39,9 @@ $(document).ready( function () { { "mDataProp": "engine" }, { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; } diff --git a/media/unit_testing/tests_onhold/6_delayed_rendering/aoColumns.fnRender.js b/media/unit_testing/tests_onhold/6_delayed_rendering/aoColumns.fnRender.js index c72fed81..eefe2ade 100755 --- a/media/unit_testing/tests_onhold/6_delayed_rendering/aoColumns.fnRender.js +++ b/media/unit_testing/tests_onhold/6_delayed_rendering/aoColumns.fnRender.js @@ -27,7 +27,7 @@ $(document).ready( function () { ); oTest.fnWaitTest( - "Confirm that fnRender passes one argument (an object) with three parameters", + "Confirm that fnRender passes two arguments with four parameters", function () { mTmp = true; oSession.fnRestore(); @@ -37,8 +37,9 @@ $(document).ready( function () { "aoColumns": [ null, { "fnRender": function (a) { - if ( arguments.length != 1 || typeof a.iDataRow=='undefined' || - typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' ) + if ( arguments.length != 2 || typeof a.iDataRow=='undefined' || + typeof a.iDataColumn=='undefined' || typeof a.aData=='undefined' || + typeof a.mDataProp=='undefined' ) { mTmp = false; }