r2702 - datepicker: fixed unit tests for namespace change. further refactoring (work in progress)

r2702 - datepicker: fixed unit tests for namespace change. further refactoring (work in progress)

Author: pazu2k@gmail.com
Date: Thu Jun 11 09:38:03 2009
New Revision: 2702
Modified:
branches/dev/datepicker/tests/unit/datepicker/datepicker_core.js
branches/dev/datepicker/tests/unit/datepicker/datepicker_events.js
branches/dev/datepicker/tests/unit/datepicker/datepicker_options.js
branches/dev/datepicker/ui/i18n/ui.datepicker-ar.js
branches/dev/datepicker/ui/ui.datepicker.js
Log:
datepicker: fixed unit tests for namespace change. further refactoring
(work in progress)
Modified: branches/dev/datepicker/tests/unit/datepicker/datepicker_core.js
==============================================================================
--- branches/dev/datepicker/tests/unit/datepicker/datepicker_core.js    
(original)
+++ branches/dev/datepicker/tests/unit/datepicker/datepicker_core.js    Thu
Jun 11 09:38:03 2009
@@ -32,7 +32,7 @@
}
function init(id, options) {
-    $.datepicker.setDefaults($.datepicker.regional['']);
+    $.ui.datepicker.setDefaults($.ui.datepicker.regional['']);
    return $(id).datepicker($.extend({duration: ''}, options || {}));
}
@@ -160,7 +160,7 @@
test('customStructure', function() {
    var dp = $('#ui-datepicker-div');
    // Check right-to-left localisation
-    var inp = init('#inp', $.datepicker.regional['he']);
+    var inp = init('#inp', $.ui.datepicker.regional['he']);
    inp.data('showButtonPanel.datepicker',true);
    inp.focus();
    var iframe = ($.browser.msie && parseInt($.browser.version) < 7);
Modified: branches/dev/datepicker/tests/unit/datepicker/datepicker_events.js
==============================================================================
--- branches/dev/datepicker/tests/unit/datepicker/datepicker_events.js    
(original)
+++ branches/dev/datepicker/tests/unit/datepicker/datepicker_events.js    Thu
Jun 11 09:38:03 2009
@@ -29,17 +29,17 @@
        simulate('keydown', {keyCode: $.simulate.VK_ENTER});
    equals(selectedThis, inp[0], 'Callback selected this');
    equals(selectedInst, $.data(inp[0], PROP_NAME), 'Callback selected inst');
-    equals(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
+    equals(selectedDate, $.ui.datepicker.formatDate('mm/dd/yy', date),
        'Callback selected date');
    inp.val('').datepicker('show').
        simulate('keydown', {ctrlKey: true, keyCode: $.simulate.VK_DOWN}).
        simulate('keydown', {keyCode: $.simulate.VK_ENTER});
    date.setDate(date.getDate() + 7);
-    equals(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
+    equals(selectedDate, $.ui.datepicker.formatDate('mm/dd/yy', date),
        'Callback selected date - ctrl+down');
    inp.val('').datepicker('show').
        simulate('keydown', {keyCode: $.simulate.VK_ESC});
-    equals(selectedDate, $.datepicker.formatDate('mm/dd/yy', date),
+    equals(selectedDate, $.ui.datepicker.formatDate('mm/dd/yy', date),
        'Callback selected date - esc');
    // onChangeMonthYear
    inp.datepicker('option', {onChangeMonthYear: callback2, onSelect: null}).
@@ -104,7 +104,7 @@
    equals(selectedDate, '', 'Callback close date - esc');
    inp.val('').datepicker('show').
        simulate('keydown', {keyCode: $.simulate.VK_ENTER});
-    equals(selectedDate, $.datepicker.formatDate('mm/dd/yy', new Date()),
+    equals(selectedDate, $.ui.datepicker.formatDate('mm/dd/yy', new Date()),
        'Callback close date - enter');
    inp.val('02/04/2008').datepicker('show').
        simulate('keydown', {keyCode: $.simulate.VK_ESC});
Modified:
branches/dev/datepicker/tests/unit/datepicker/datepicker_options.js
==============================================================================
--- branches/dev/datepicker/tests/unit/datepicker/datepicker_options.js    
(original)
+++ branches/dev/datepicker/tests/unit/datepicker/datepicker_options.js    Thu
Jun 11 09:38:03 2009
@@ -8,11 +8,11 @@
test('setDefaults', function() {
    var inp = init('#inp');
-    equals($.datepicker._defaults.showOn, 'focus', 'Initial showOn');
-    $.datepicker.setDefaults({showOn: 'button'});
-    equals($.datepicker._defaults.showOn, 'button', 'Change default showOn');
-    $.datepicker.setDefaults({showOn: 'focus'});
-    equals($.datepicker._defaults.showOn, 'focus', 'Restore showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Initial showOn');
+    $.ui.datepicker.setDefaults({showOn: 'button'});
+    equals($.ui.datepicker._defaults.showOn, 'button', 'Change default
showOn');
+    $.ui.datepicker.setDefaults({showOn: 'focus'});
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Restore showOn');
});
test('option', function() {
@@ -20,20 +20,20 @@
    var inst = $.data(inp[0], PROP_NAME);
    // Set option
    equals(inst.settings.showOn, null, 'Initial setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Initial default
showOn');
    inp.datepicker('option', 'showOn', 'button');
    equals(inst.settings.showOn, 'button', 'Change setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'button', 'Change instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'button', 'Change instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
    inp.datepicker('option', {showOn: 'both'});
    equals(inst.settings.showOn, 'both', 'Change setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'both', 'Change instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'both', 'Change instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
    inp.datepicker('option', 'showOn', undefined);
    equals(inst.settings.showOn, null, 'Clear setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'focus', 'Restore instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'focus', 'Restore instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
    // Get option
    inp = init('#inp');
    equals(inp.datepicker('option', 'showOn'), 'focus', 'Initial setting
showOn');
@@ -42,7 +42,7 @@
    inp.datepicker('option', 'showOn', undefined);
    equals(inp.datepicker('option', 'showOn'), 'focus', 'Reset instance
showOn');
    same(inp.datepicker('option', 'all'), {duration: ''}, 'Get instance
settings');
-    same(inp.datepicker('option', 'defaults'), $.datepicker._defaults,
+    same(inp.datepicker('option', 'defaults'), $.ui.datepicker._defaults,
        'Get default settings');
});
@@ -50,20 +50,20 @@
    var inp = init('#inp');
    var inst = $.data(inp[0], PROP_NAME);
    equals(inst.settings.showOn, null, 'Initial setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Initial default
showOn');
    inp.datepicker('change', 'showOn', 'button');
    equals(inst.settings.showOn, 'button', 'Change setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'button', 'Change instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'button', 'Change instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
    inp.datepicker('change', {showOn: 'both'});
    equals(inst.settings.showOn, 'both', 'Change setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'both', 'Change instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'both', 'Change instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
    inp.datepicker('change', 'showOn', undefined);
    equals(inst.settings.showOn, null, 'Clear setting showOn');
-    equals($.datepicker._get(inst, 'showOn'), 'focus', 'Restore instance
showOn');
-    equals($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
+    equals($.ui.datepicker._get(inst, 'showOn'), 'focus', 'Restore instance
showOn');
+    equals($.ui.datepicker._defaults.showOn, 'focus', 'Retain default
showOn');
});
test('invocation', function() {
@@ -245,8 +245,8 @@
    equals(dp.find('.ui-datepicker-next').text(), 'Next', 'Navigation next -
default');
    inp.datepicker('hide').datepicker('option', {navigationAsDateFormat:
true, prevText: '< M', currentText: 'MM', nextText: 'M >'}).
        val('02/04/2008').datepicker('show');
-    var longNames = $.datepicker.regional[''].monthNames;
-    var shortNames = $.datepicker.regional[''].monthNamesShort;
+    var longNames = $.ui.datepicker.regional[''].monthNames;
+    var shortNames = $.ui.datepicker.regional[''].monthNamesShort;
    var date = new Date();
    equals(dp.find('.ui-datepicker-prev').text(), '< ' +
shortNames[0], 'Navigation prev - as date format');
    equals(dp.find('.ui-datepicker-current').text(),
@@ -572,7 +572,7 @@
function calcWeek(date) {
    var doy = date.getDate() + 6;
    for (var m = date.getMonth() - 1; m >= 0; m--)
-        doy += $.datepicker._getDaysInMonth(date.getFullYear(), m);
+        doy += $.ui.datepicker._getDaysInMonth(date.getFullYear(), m);
    // Simple count from 01/01 starting at week 1
    return Math.floor(doy / 7);
}
@@ -581,9 +581,9 @@
    // Before show
    var inp = init('#inp', {beforeShow: beforeAll});
    var inst = $.data(inp[0], 'datepicker');
-    equals($.datepicker._get(inst, 'currentText'), 'Today', 'Before show -
initial');
+    equals($.ui.datepicker._get(inst, 'currentText'), 'Today', 'Before show -
initial');
    inp.val('02/04/2008').datepicker('show');
-    equals($.datepicker._get(inst, 'currentText'), 'Current', 'Before show -
changed');
+    equals($.ui.datepicker._get(inst, 'currentText'), 'Current', 'Before show
- changed');
    ok(beforeShowThis.id == inp[0].id, 'Before show - this OK');
    ok(beforeShowInput.id == inp[0].id, 'Before show - input OK');
    isObj(beforeShowInst, inst, 'Before show - inst OK');
@@ -606,7 +606,7 @@
});
test('localisation', function() {
-    var inp = init('#inp', $.datepicker.regional['fr']);
+    var inp = init('#inp', $.ui.datepicker.regional['fr']);
    inp.datepicker('option', {dateFormat: 'DD, d MM yy',
showButtonPanel:true, changeMonth:true,
changeYear:true}).val('').datepicker('show');
    var dp = $('#ui-datepicker-div');
    equals($('.ui-datepicker-close', dp).text(), 'Fermer', 'Localisation -
close');
@@ -616,106 +616,106 @@
    equals($('.ui-datepicker-next', dp).text(), 'Suiv>', 'Localisation -
next');
    var month = 0;
    $('.ui-datepicker-month option', dp).each(function() {
-        equals($(this).text(),
$.datepicker.regional['fr'].monthNamesShort[month],
+        equals($(this).text(),
$.ui.datepicker.regional['fr'].monthNamesShort[month],
            'Localisation - month ' + month);
        month++;
    });
    var day = 1;
    $('.ui-datepicker-calendar th', dp).each(function() {
-        equals($(this).text(), $.datepicker.regional['fr'].dayNamesMin[day],
+        equals($(this).text(), $.ui.datepicker.regional['fr'].dayNamesMin[day],
            'Localisation - day ' + day);
        day = (day + 1) % 7;
    });
    inp.simulate('keydown', {keyCode: $.simulate.VK_ENTER});
    var date = new Date();
-    equals(inp.val(), $.datepicker.regional['fr'].dayNames[date.getDay()]
+ ', ' +
-        date.getDate() + ' ' +
$.datepicker.regional['fr'].monthNames[date.getMonth()] +
+    equals(inp.val(), $.ui.datepicker.regional['fr'].dayNames[date.getDay()]
+ ', ' +
+        date.getDate() + ' ' +
$.ui.datepicker.regional['fr'].monthNames[date.getMonth()] +
        ' ' + date.getFullYear(), 'Localisation - formatting');
});
test('noWeekends', function() {
    for (var i = 1; i <= 31; i++) {
        var date = new Date(2001, 1 - 1, i);
-        isSet($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ''],
+        isSet($.ui.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ''],
            'No weekends ' + date);
    }
});
test('iso8601Week', function() {
    var date = new Date(2000, 12 - 1, 31);
-    equals($.datepicker.iso8601Week(date), 52, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 52, 'ISO 8601 week ' + date);
    date = new Date(2001, 1 - 1, 1);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
    date = new Date(2001, 1 - 1, 7);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
    date = new Date(2001, 1 - 1, 8);
-    equals($.datepicker.iso8601Week(date), 2, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 2, 'ISO 8601 week ' + date);
    date = new Date(2003, 12 - 1, 28);
-    equals($.datepicker.iso8601Week(date), 52, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 52, 'ISO 8601 week ' + date);
    date = new Date(2003, 12 - 1, 29);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
    date = new Date(2004, 1 - 1, 4);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
    date = new Date(2004, 1 - 1, 5);
-    equals($.datepicker.iso8601Week(date), 2, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 2, 'ISO 8601 week ' + date);
    date = new Date(2009, 12 - 1, 28);
-    equals($.datepicker.iso8601Week(date), 53, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 53, 'ISO 8601 week ' + date);
    date = new Date(2010, 1 - 1, 3);
-    equals($.datepicker.iso8601Week(date), 53, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 53, 'ISO 8601 week ' + date);
    date = new Date(2010, 1 - 1, 4);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
    date = new Date(2010, 1 - 1, 10);
-    equals($.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
+    equals($.ui.datepicker.iso8601Week(date), 1, 'ISO 8601 week ' + date);
});
test('parseDate', function() {
    init('#inp');
-    ok($.datepicker.parseDate('d m y', '') == null, 'Parse date empty');
-    equalsDate($.datepicker.parseDate('d m y', '3 2 01'),
+    ok($.ui.datepicker.parseDate('d m y', '') == null, 'Parse date empty');
+    equalsDate($.ui.datepicker.parseDate('d m y', '3 2 01'),
        new Date(2001, 2 - 1, 3), 'Parse date d m y');
-    equalsDate($.datepicker.parseDate('dd mm yy', '03 02 2001'),
+    equalsDate($.ui.datepicker.parseDate('dd mm yy', '03 02 2001'),
        new Date(2001, 2 - 1, 3), 'Parse date dd mm yy');
-    equalsDate($.datepicker.parseDate('d m y', '13 12 01'),
+    equalsDate($.ui.datepicker.parseDate('d m y', '13 12 01'),
        new Date(2001, 12 - 1, 13), 'Parse date d m y');
-    equalsDate($.datepicker.parseDate('dd mm yy', '13 12 2001'),
+    equalsDate($.ui.datepicker.parseDate('dd mm yy', '13 12 2001'),
        new Date(2001, 12 - 1, 13), 'Parse date dd mm yy');
-    equalsDate($.datepicker.parseDate('y-o', '2001-34'),
+    equalsDate($.ui.datepicker.parseDate('y-o', '2001-34'),
        new Date(2001, 2 - 1, 3), 'Parse date y-o');
-    equalsDate($.datepicker.parseDate('yy-oo', '2001-347'),
+    equalsDate($.ui.datepicker.parseDate('yy-oo', '2001-347'),
        new Date(2001, 12 - 1, 13), 'Parse date yy oo');
-    equalsDate($.datepicker.parseDate('oo yy', '348 2004'),
+    equalsDate($.ui.datepicker.parseDate('oo yy', '348 2004'),
        new Date(2004, 12 - 1, 13), 'Parse date oo-yy');
-    equalsDate($.datepicker.parseDate('D d M y', 'Sat 3 Feb 01'),
+    equalsDate($.ui.datepicker.parseDate('D d M y', 'Sat 3 Feb 01'),
        new Date(2001, 2 - 1, 3), 'Parse date D d M y');
-    equalsDate($.datepicker.parseDate('d MM DD yy', '3 February Saturday
2001'),
+    equalsDate($.ui.datepicker.parseDate('d MM DD yy', '3 February Saturday
2001'),
        new Date(2001, 2 - 1, 3), 'Parse date dd MM DD yy');
-    equalsDate($.datepicker.parseDate('DD, MM d, yy', 'Saturday, February 3,
2001'),
+    equalsDate($.ui.datepicker.parseDate('DD, MM d, yy', 'Saturday, February
3, 2001'),
        new Date(2001, 2 - 1, 3), 'Parse date DD, MM d, yy');
-    equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
+    equalsDate($.ui.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'),
yy',
        'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
        'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
-    equalsDate($.datepicker.parseDate('y-m-d', '01-02-03'),
+    equalsDate($.ui.datepicker.parseDate('y-m-d', '01-02-03'),
        new Date(2001, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-    equalsDate($.datepicker.parseDate('y-m-d', '51-02-03'),
+    equalsDate($.ui.datepicker.parseDate('y-m-d', '51-02-03'),
        new Date(1951, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-    equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff:
80}),
+    equalsDate($.ui.datepicker.parseDate('y-m-d', '51-02-03',
{shortYearCutoff: 80}),
        new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
-    equalsDate($.datepicker.parseDate('y-m-d', '51-02-03',
{shortYearCutoff: '+60'}),
+    equalsDate($.ui.datepicker.parseDate('y-m-d', '51-02-03',
{shortYearCutoff: '+60'}),
        new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
    var gmtDate = new Date(2001, 2 - 1, 3);
    gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
-    equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse
date @');
-    equalsDate($.datepicker.parseDate('!', '631167552000000000'),
gmtDate, 'Parse date !');
-    var fr = $.datepicker.regional['fr'];
+    equalsDate($.ui.datepicker.parseDate('@', '981158400000'),
gmtDate, 'Parse date @');
+    equalsDate($.ui.datepicker.parseDate('!', '631167552000000000'),
gmtDate, 'Parse date !');
+    var fr = $.ui.datepicker.regional['fr'];
    var settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
        monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-    equalsDate($.datepicker.parseDate('D d M y', 'Lun 9 Avr 01', settings),
+    equalsDate($.ui.datepicker.parseDate('D d M y', 'Lun 9 Avr 01', settings),
        new Date(2001, 4 - 1, 9), 'Parse date D M y with settings');
-    equalsDate($.datepicker.parseDate('d MM DD yy', '9 Avril Lundi 2001',
settings),
+    equalsDate($.ui.datepicker.parseDate('d MM DD yy', '9 Avril Lundi 2001',
settings),
        new Date(2001, 4 - 1, 9), 'Parse date d MM DD yy with settings');
-    equalsDate($.datepicker.parseDate('DD, MM d, yy', 'Lundi, Avril 9, 2001',
settings),
+    equalsDate($.ui.datepicker.parseDate('DD, MM d, yy', 'Lundi, Avril 9,
2001', settings),
        new Date(2001, 4 - 1, 9), 'Parse date DD, MM d, yy with settings');
-    equalsDate($.datepicker.parseDate('\'jour\' d \'de\' MM (\'\'DD\'\'), yy',
+    equalsDate($.ui.datepicker.parseDate('\'jour\' d \'de\' MM (\'\'DD\'\'),
yy',
        'jour 9 de Avril (\'Lundi\'), 2001', settings), new Date(2001, 4 - 1, 9),
        'Parse date \'jour\' d \'de\' MM (\'\'DD\'\'), yy with settings');
});
@@ -731,83 +731,83 @@
            equals(e, error, 'Parsed error ' + value);
        }
    };
-    expectError(function() { $.datepicker.parseDate(null, 'Sat 2 01'); },
+    expectError(function() { $.ui.datepicker.parseDate(null, 'Sat 2 01'); },
        'Sat 2 01', 'Invalid arguments');
-    expectError(function() { $.datepicker.parseDate('d m y', null); },
+    expectError(function() { $.ui.datepicker.parseDate('d m y', null); },
        'null', 'Invalid arguments');
-    expectError(function() { $.datepicker.parseDate('d m y', 'Sat 2 01'); },
+    expectError(function() { $.ui.datepicker.parseDate('d m y', 'Sat 2 01');
},
        'Sat 2 01 - d m y', 'Missing number at position 0');
-    expectError(function() { $.datepicker.parseDate('dd mm yy', 'Sat 2 01');
},
+    expectError(function() { $.ui.datepicker.parseDate('dd mm yy', 'Sat 2
01'); },
        'Sat 2 01 - dd mm yy', 'Missing number at position 0');
-    expectError(function() { $.datepicker.parseDate('d m y', '3 Feb 01'); },
+    expectError(function() { $.ui.datepicker.parseDate('d m y', '3 Feb 01');
},
        '3 Feb 01 - d m y', 'Missing number at position 2');
-    expectError(function() { $.datepicker.parseDate('dd mm yy', '3 Feb 01');
},
+    expectError(function() { $.ui.datepicker.parseDate('dd mm yy', '3 Feb
01'); },
        '3 Feb 01 - dd mm yy', 'Missing number at position 2');
-    expectError(function() { $.datepicker.parseDate('d m y', '3 2 AD01'); },
+    expectError(function() { $.ui.datepicker.parseDate('d m y', '3 2 AD01');
},
        '3 2 AD01 - d m y', 'Missing number at position 4');
-    expectError(function() { $.datepicker.parseDate('d m yy', '3 2 AD01'); },
+    expectError(function() { $.ui.datepicker.parseDate('d m yy', '3 2 AD01');
},
        '3 2 AD01 - dd mm yy', 'Missing number at position 4');
-    expectError(function() { $.datepicker.parseDate('y-o', '2001-D01'); },
+    expectError(function() { $.ui.datepicker.parseDate('y-o', '2001-D01'); },
        '2001-D01 - y-o', 'Missing number at position 5');
-    expectError(function() { $.datepicker.parseDate('yy-oo', '2001-D01'); },
+    expectError(function() { $.ui.datepicker.parseDate('yy-oo', '2001-D01');
},
        '2001-D01 - yy-oo', 'Missing number at position 5');
-    expectError(function() { $.datepicker.parseDate('D d M y', 'D7 3 Feb
01'); },
+    expectError(function() { $.ui.datepicker.parseDate('D d M y', 'D7 3 Feb
01'); },
        'D7 3 Feb 01 - D d M y', 'Unknown name at position 0');
-    expectError(function() { $.datepicker.parseDate('D d M y', 'Sat 3 M2
01'); },
+    expectError(function() { $.ui.datepicker.parseDate('D d M y', 'Sat 3 M2
01'); },
        'Sat 3 M2 01 - D d M y', 'Unknown name at position 6');
-    expectError(function() { $.datepicker.parseDate('DD, MM d,
yy', 'Saturday- Feb 3, 2001'); },
+    expectError(function() { $.ui.datepicker.parseDate('DD, MM d,
yy', 'Saturday- Feb 3, 2001'); },
        'Saturday- Feb 3, 2001 - DD, MM d, yy', 'Unexpected literal at position
8');
-    expectError(function() { $.datepicker.parseDate('\'day\' d \'of\' MM
(\'\'DD\'\'), yy',
+    expectError(function() { $.ui.datepicker.parseDate('\'day\' d \'of\' MM
(\'\'DD\'\'), yy',
        'day 3 of February ("Saturday"), 2001'); },
        'day 3 of Mon2 ("Day7"), 2001', 'Unexpected literal at position 19');
-    expectError(function() { $.datepicker.parseDate('d m y', '29 2 01'); },
+    expectError(function() { $.ui.datepicker.parseDate('d m y', '29 2 01'); },
        '29 2 01 - d m y', 'Invalid date');
-    var fr = $.datepicker.regional['fr'];
+    var fr = $.ui.datepicker.regional['fr'];
    var settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
        monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-    expectError(function() { $.datepicker.parseDate('D d M y', 'Mon 9 Avr
01', settings); },
+    expectError(function() { $.ui.datepicker.parseDate('D d M y', 'Mon 9 Avr
01', settings); },
        'Mon 9 Avr 01 - D d M y', 'Unknown name at position 0');
-    expectError(function() { $.datepicker.parseDate('D d M y', 'Lun 9 Apr
01', settings); },
+    expectError(function() { $.ui.datepicker.parseDate('D d M y', 'Lun 9 Apr
01', settings); },
        'Lun 9 Apr 01 - D d M y', 'Unknown name at position 6');
});
test('formatDate', function() {
    init('#inp');
-    equals($.datepicker.formatDate('d m y', new Date(2001, 2 - 1, 3)),
+    equals($.ui.datepicker.formatDate('d m y', new Date(2001, 2 - 1, 3)),
        '3 2 01', 'Format date d m y');
-    equals($.datepicker.formatDate('dd mm yy', new Date(2001, 2 - 1, 3)),
+    equals($.ui.datepicker.formatDate('dd mm yy', new Date(2001, 2 - 1, 3)),
        '03 02 2001', 'Format date dd mm yy');
-    equals($.datepicker.formatDate('d m y', new Date(2001, 12 - 1, 13)),
+    equals($.ui.datepicker.formatDate('d m y', new Date(2001, 12 - 1, 13)),
        '13 12 01', 'Format date d m y'