From 827d4c1ae48e90a38e3c89d983492cf1c8e9b59f Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 13 Apr 2012 18:23:43 +0100 Subject: [PATCH] Fix unit tests: Witht he change to allow info macros in any of the strings the unit tests need updating to reflect this --- media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js | 4 ++-- media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js | 4 ++-- .../unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js | 4 ++-- .../tests_onhold/4_server-side/oLanguage.sInfoEmpty.js | 4 ++-- .../tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js | 4 ++-- .../tests_onhold/6_delayed_rendering/oLanguage.sInfoEmpty.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js index 386e29da..188984fc 100755 --- a/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/1_dom/oLanguage.sInfoEmpty.js @@ -52,7 +52,7 @@ $(document).ready( function () { oTest.fnTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -65,7 +65,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } ); diff --git a/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js index 86d61528..3bfc60b8 100644 --- a/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/2_js/oLanguage.sInfoEmpty.js @@ -55,7 +55,7 @@ $(document).ready( function () { oTest.fnTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -69,7 +69,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } ); diff --git a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js index 7079611e..a5066cf8 100644 --- a/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/3_ajax/oLanguage.sInfoEmpty.js @@ -55,7 +55,7 @@ $(document).ready( function () { oTest.fnWaitTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -69,7 +69,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } ); diff --git a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoEmpty.js index 96061b37..1ce79dd2 100644 --- a/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/4_server-side/oLanguage.sInfoEmpty.js @@ -57,7 +57,7 @@ $(document).ready( function () { oTest.fnWaitTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -72,7 +72,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } ); diff --git a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js index a98cf5b9..423a0d46 100644 --- a/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/5_ajax_objects/oLanguage.sInfoEmpty.js @@ -69,7 +69,7 @@ $(document).ready( function () { oTest.fnWaitTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -90,7 +90,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } ); diff --git a/media/unit_testing/tests_onhold/6_delayed_rendering/oLanguage.sInfoEmpty.js b/media/unit_testing/tests_onhold/6_delayed_rendering/oLanguage.sInfoEmpty.js index 31d70738..e5ad5e9e 100644 --- a/media/unit_testing/tests_onhold/6_delayed_rendering/oLanguage.sInfoEmpty.js +++ b/media/unit_testing/tests_onhold/6_delayed_rendering/oLanguage.sInfoEmpty.js @@ -57,7 +57,7 @@ $(document).ready( function () { oTest.fnWaitTest( - "Macro's not replaced", + "Macro's replaced", function () { oSession.fnRestore(); oTable = $('#example').dataTable( { @@ -72,7 +72,7 @@ $(document).ready( function () { function () { var bReturn = document.getElementById('example_info').innerHTML.replace( ' '+oSettings.oLanguage.sInfoFiltered.replace( '_MAX_', '57' ), "" ) == - "unit _START_ _END_ _TOTAL_ test"; + "unit 1 0 0 test"; return bReturn; } );