From e08f95f5a24c24929a737faf8873f34761e08dd2 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Sun, 29 May 2011 19:00:16 +0100 Subject: [PATCH] Update: Unit tests which text the argument count for fnServerData updated to include oSettings being passed as fourth argument New: sLoadingRecords tests added for Ajax source loading --- .../tests_onhold/3_ajax/fnServerData.js | 8 +-- .../3_ajax/oLanguage.sLoadingRecords.js | 65 +++++++++++++++++++ .../5_ajax_objects/fnServerData.js | 8 +-- .../6_delayed_rendering/fnServerData.js | 8 +-- 4 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 media/unit_testing/tests_onhold/3_ajax/oLanguage.sLoadingRecords.js diff --git a/media/unit_testing/tests_onhold/3_ajax/fnServerData.js b/media/unit_testing/tests_onhold/3_ajax/fnServerData.js index 3bfdbbfa..ab20ba3d 100644 --- a/media/unit_testing/tests_onhold/3_ajax/fnServerData.js +++ b/media/unit_testing/tests_onhold/3_ajax/fnServerData.js @@ -14,7 +14,7 @@ $(document).ready( function () { } } ); }, - function () { return mPass == 3; } + function () { return mPass == 4; } ); oTest.fnTest( @@ -23,7 +23,7 @@ $(document).ready( function () { $('#example').dataTable( { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = sUrl == "../../../examples/ajax/sources/arrays.txt"; } } ); @@ -37,7 +37,7 @@ $(document).ready( function () { $('#example').dataTable( { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = aoData.length==0; } } ); @@ -51,7 +51,7 @@ $(document).ready( function () { $('#example').dataTable( { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = typeof fnCallback == 'function'; } } ); diff --git a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sLoadingRecords.js b/media/unit_testing/tests_onhold/3_ajax/oLanguage.sLoadingRecords.js new file mode 100644 index 00000000..616b0ef3 --- /dev/null +++ b/media/unit_testing/tests_onhold/3_ajax/oLanguage.sLoadingRecords.js @@ -0,0 +1,65 @@ +// DATA_TEMPLATE: empty_table +oTest.fnStart( "oLanguage.sLoadingRecords" ); + +$(document).ready( function () { + var tmp = false; + oTest.fnTest( + "Default loading text is 'Loading...'", + function () { + $('#example').dataTable( { + "sAjaxSource": "../../../examples/ajax/sources/arrays.txt" + } ); + tmp = $('#example tbody tr td')[0].innerHTML == "Loading..."; + }, + function () { return tmp; } + ); + + oTest.fnTest( + "Text can be overriden", + function () { + oSession.fnRestore(); + $('#example').dataTable( { + "oLanguage": { + "sLoadingRecords": "unitest" + }, + "sAjaxSource": "../../../examples/ajax/sources/arrays.txt" + } ); + tmp = $('#example tbody tr td')[0].innerHTML == "unitest"; + }, + function () { return tmp; } + ); + + oTest.fnTest( + "When sZeroRecords is given but sLoadingRecords is not, sZeroRecords is used", + function () { + oSession.fnRestore(); + $('#example').dataTable( { + "oLanguage": { + "sZeroRecords": "unitest_sZeroRecords" + }, + "sAjaxSource": "../../../examples/ajax/sources/arrays.txt" + } ); + tmp = $('#example tbody tr td')[0].innerHTML == "unitest_sZeroRecords"; + }, + function () { return tmp; } + ); + + oTest.fnTest( + "sLoadingRecords and sZeroRecords both given", + function () { + oSession.fnRestore(); + $('#example').dataTable( { + "oLanguage": { + "sZeroRecords": "unitest_sZeroRecords2", + "sLoadingRecords": "unitest2" + }, + "sAjaxSource": "../../../examples/ajax/sources/arrays.txt" + } ); + tmp = $('#example tbody tr td')[0].innerHTML == "unitest2"; + }, + function () { return tmp; } + ); + + + oTest.fnComplete(); +} ); \ No newline at end of file diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js b/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js index 1ae572cb..8ab5e74a 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/fnServerData.js @@ -21,7 +21,7 @@ $(document).ready( function () { } } ); }, - function () { return mPass == 3; } + function () { return mPass == 4; } ); oTest.fnTest( @@ -37,7 +37,7 @@ $(document).ready( function () { { "mDataProp": "version", "aTargets": [3] }, { "mDataProp": "grade", "aTargets": [4] } ], - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = sUrl == "../../../examples/ajax/sources/objects.txt"; } } ); @@ -58,7 +58,7 @@ $(document).ready( function () { { "mDataProp": "version", "aTargets": [3] }, { "mDataProp": "grade", "aTargets": [4] } ], - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = aoData.length==0; } } ); @@ -79,7 +79,7 @@ $(document).ready( function () { { "mDataProp": "version", "aTargets": [3] }, { "mDataProp": "grade", "aTargets": [4] } ], - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = typeof fnCallback == 'function'; } } ); diff --git a/media/unit_testing/tests_onhold/6_delayed_rendering/fnServerData.js b/media/unit_testing/tests_onhold/6_delayed_rendering/fnServerData.js index cd116d67..5c4b3191 100644 --- a/media/unit_testing/tests_onhold/6_delayed_rendering/fnServerData.js +++ b/media/unit_testing/tests_onhold/6_delayed_rendering/fnServerData.js @@ -15,7 +15,7 @@ $(document).ready( function () { } } ); }, - function () { return mPass == 3; } + function () { return mPass == 4; } ); oTest.fnTest( @@ -25,7 +25,7 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", "bDeferRender": true, - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = sUrl == "../../../examples/ajax/sources/arrays.txt"; } } ); @@ -40,7 +40,7 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", "bDeferRender": true, - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = aoData.length==0; } } ); @@ -55,7 +55,7 @@ $(document).ready( function () { "bDestroy": true, "sAjaxSource": "../../../examples/ajax/sources/arrays.txt", "bDeferRender": true, - "fnServerData": function (sUrl, aoData, fnCallback) { + "fnServerData": function (sUrl, aoData, fnCallback, oSettings) { mPass = typeof fnCallback == 'function'; } } );