Dev: remove globals from tests and moved test helpers to correct location - Fixed #8770 Dev: Remove globals and Standardize Test Suite

1 files changed, 108 insertions, 108 deletions

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index 7d3217364..00910469e 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -8,7 +8,7 @@ module("datepicker: options");
 
 test('setDefaults', function() {
 	expect( 3 );
-	init('#inp');
+	TestHelpers.datepicker.init('#inp');
 	equal($.datepicker._defaults.showOn, 'focus', 'Initial showOn');
 	$.datepicker.setDefaults({showOn: 'button'});
 	equal($.datepicker._defaults.showOn, 'button', 'Change default showOn');
@@ -18,8 +18,8 @@ test('setDefaults', function() {
 
 test('option', function() {
 	expect( 17 );
-	var inp = init('#inp'),
-	inst = $.data(inp[0], TestHelpers.PROP_NAME);
+	var inp = TestHelpers.datepicker.init('#inp'),
+	inst = $.data(inp[0], TestHelpers.datepicker.PROP_NAME);
 	// Set option
 	equal(inst.settings.showOn, null, 'Initial setting showOn');
 	equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
@@ -37,7 +37,7 @@ test('option', function() {
 	equal($.datepicker._get(inst, 'showOn'), 'focus', 'Restore instance showOn');
 	equal($.datepicker._defaults.showOn, 'focus', 'Retain default showOn');
 	// Get option
-	inp = init('#inp');
+	inp = TestHelpers.datepicker.init('#inp');
 	equal(inp.datepicker('option', 'showOn'), 'focus', 'Initial setting showOn');
 	inp.datepicker('option', 'showOn', 'button');
 	equal(inp.datepicker('option', 'showOn'), 'button', 'Change instance showOn');
@@ -50,8 +50,8 @@ test('option', function() {
 
 test('change', function() {
 	expect( 12 );
-	var inp = init('#inp'),
-	inst = $.data(inp[0], TestHelpers.PROP_NAME);
+	var inp = TestHelpers.datepicker.init('#inp'),
+	inst = $.data(inp[0], TestHelpers.datepicker.PROP_NAME);
 	equal(inst.settings.showOn, null, 'Initial setting showOn');
 	equal($.datepicker._get(inst, 'showOn'), 'focus', 'Initial instance showOn');
 	equal($.datepicker._defaults.showOn, 'focus', 'Initial default showOn');
@@ -72,7 +72,7 @@ test('change', function() {
 test('invocation', function() {
 	expect( 29 );
 	var button, image,
-		inp = init('#inp'),
+		inp = TestHelpers.datepicker.init('#inp'),
 		dp = $('#ui-datepicker-div'),
 		body = $('body');
 	// On focus
@@ -90,7 +90,7 @@ test('invocation', function() {
 	ok(!dp.is(':visible'), 'Focus - hidden on external click');
 	inp.datepicker('hide').datepicker('destroy');
 	// On button
-	inp = init('#inp', {showOn: 'button', buttonText: 'Popup'});
+	inp = TestHelpers.datepicker.init('#inp', {showOn: 'button', buttonText: 'Popup'});
 	ok(!dp.is(':visible'), 'Button - initially hidden');
 	button = inp.siblings('button');
 	image = inp.siblings('img');
@@ -105,7 +105,7 @@ test('invocation', function() {
 	ok(!dp.is(':visible'), 'Button - hidden on second button click');
 	inp.datepicker('hide').datepicker('destroy');
 	// On image button
-	inp = init('#inp', {showOn: 'button', buttonImageOnly: true,
+	inp = TestHelpers.datepicker.init('#inp', {showOn: 'button', buttonImageOnly: true,
 		buttonImage: 'img/calendar.gif', buttonText: 'Cal'});
 	ok(!dp.is(':visible'), 'Image button - initially hidden');
 	button = inp.siblings('button');
@@ -122,7 +122,7 @@ test('invocation', function() {
 	ok(!dp.is(':visible'), 'Image button - hidden on second image click');
 	inp.datepicker('hide').datepicker('destroy');
 	// On both
-	inp = init('#inp', {showOn: 'both', buttonImage: 'img/calendar.gif'});
+	inp = TestHelpers.datepicker.init('#inp', {showOn: 'both', buttonImage: 'img/calendar.gif'});
 	ok(!dp.is(':visible'), 'Both - initially hidden');
 	button = inp.siblings('button');
 	ok(button.length === 1, 'Both - button present');
@@ -143,7 +143,7 @@ test('invocation', function() {
 
 test('otherMonths', function() {
 	expect( 8 );
-	var inp = init('#inp'),
+	var inp = TestHelpers.datepicker.init('#inp'),
 		pop = $('#ui-datepicker-div');
 	inp.val('06/01/2009').datepicker('show');
 	equal(pop.find('tbody').text(), '\u00a0123456789101112131415161718192021222324252627282930\u00a0\u00a0\u00a0\u00a0',
@@ -165,104 +165,104 @@ test('otherMonths', function() {
 
 test('defaultDate', function() {
 	expect( 17 );
-	var inp = init('#inp'),
+	var inp = TestHelpers.datepicker.init('#inp'),
 		date = new Date();
 	inp.val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), date, 'Default date null');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date null');
 	// Numeric values
 	inp.datepicker('option', {defaultDate: -2}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() - 2);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date -2');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date -2');
 	inp.datepicker('option', {defaultDate: 3}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() + 5);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date 3');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date 3');
 	inp.datepicker('option', {defaultDate: 1 / 0}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() - 3);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date Infinity');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date Infinity');
 	inp.datepicker('option', {defaultDate: 1 / 'a'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), date, 'Default date NaN');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date NaN');
 	// String offset values
 	inp.datepicker('option', {defaultDate: '-1d'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() - 1);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date -1d');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date -1d');
 	inp.datepicker('option', {defaultDate: '+3D'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() + 4);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date +3D');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date +3D');
 	inp.datepicker('option', {defaultDate: ' -2 w '}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date = new Date();
 	date.setDate(date.getDate() - 14);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date -2 w');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date -2 w');
 	inp.datepicker('option', {defaultDate: '+1 W'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setDate(date.getDate() + 21);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date +1 W');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date +1 W');
 	inp.datepicker('option', {defaultDate: ' -1 m '}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	date = TestHelpers.addMonths(new Date(), -1);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date -1 m');
+	date = TestHelpers.datepicker.addMonths(new Date(), -1);
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date -1 m');
 	inp.datepicker('option', {defaultDate: '+2M'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	date = TestHelpers.addMonths(new Date(), 2);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date +2M');
+	date = TestHelpers.datepicker.addMonths(new Date(), 2);
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date +2M');
 	inp.datepicker('option', {defaultDate: '-2y'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date = new Date();
 	date.setFullYear(date.getFullYear() - 2);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date -2y');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date -2y');
 	inp.datepicker('option', {defaultDate: '+1 Y '}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date.setFullYear(date.getFullYear() + 3);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date +1 Y');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date +1 Y');
 	inp.datepicker('option', {defaultDate: '+1M +10d'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	date = TestHelpers.addMonths(new Date(), 1);
+	date = TestHelpers.datepicker.addMonths(new Date(), 1);
 	date.setDate(date.getDate() + 10);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date +1M +10d');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date +1M +10d');
 	// String date values
 	inp.datepicker('option', {defaultDate: '07/04/2007'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date = new Date(2007, 7 - 1, 4);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date 07/04/2007');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date 07/04/2007');
 	inp.datepicker('option', {dateFormat: 'yy-mm-dd', defaultDate: '2007-04-02'}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
 	date = new Date(2007, 4 - 1, 2);
-	equalsDate(inp.datepicker('getDate'), date, 'Default date 2007-04-02');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date 2007-04-02');
 	// Date value
 	date = new Date(2007, 1 - 1, 26);
 	inp.datepicker('option', {dateFormat: 'mm/dd/yy', defaultDate: date}).
 		datepicker('hide').val('').datepicker('show').
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), date, 'Default date 01/26/2007');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date, 'Default date 01/26/2007');
 });
 
 test('miscellaneous', function() {
 	expect( 19 );
 	var curYear, longNames, shortNames, date,
 		dp = $('#ui-datepicker-div'),
-		inp = init('#inp');
+		inp = TestHelpers.datepicker.init('#inp');
 	// Year range
 	function genRange(start, offset) {
 		var i = start,
@@ -323,7 +323,7 @@ test('miscellaneous', function() {
 test('minMax', function() {
 	expect( 17 );
 	var date,
-		inp = init('#inp'),
+		inp = TestHelpers.datepicker.init('#inp'),
 		lastYear = new Date(2007, 6 - 1, 4),
 		nextYear = new Date(2009, 6 - 1, 4),
 		minDate = new Date(2008, 2 - 1, 29),
@@ -331,45 +331,45 @@ test('minMax', function() {
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), lastYear,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), lastYear,
 		'Min/max - null, null - ctrl+pgup');
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), nextYear,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), nextYear,
 		'Min/max - null, null - ctrl+pgdn');
 	inp.datepicker('option', {minDate: minDate}).
 		datepicker('hide').val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), minDate,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate,
 		'Min/max - 02/29/2008, null - ctrl+pgup');
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), nextYear,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), nextYear,
 		'Min/max - 02/29/2008, null - ctrl+pgdn');
 	inp.datepicker('option', {maxDate: maxDate}).
 		datepicker('hide').val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), minDate,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate,
 		'Min/max - 02/29/2008, 12/07/2008 - ctrl+pgup');
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), maxDate,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate,
 		'Min/max - 02/29/2008, 12/07/2008 - ctrl+pgdn');
 	inp.datepicker('option', {minDate: null}).
 		datepicker('hide').val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), lastYear,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), lastYear,
 		'Min/max - null, 12/07/2008 - ctrl+pgup');
 	inp.val('06/04/2008').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), maxDate,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate,
 		'Min/max - null, 12/07/2008 - ctrl+pgdn');
 	// Relative dates
 	date = new Date();
@@ -378,80 +378,80 @@ test('minMax', function() {
 		datepicker('hide').val('').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), date,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date,
 		'Min/max - -1w, +1 M +10 D - ctrl+pgup');
-	date = TestHelpers.addMonths(new Date(), 1);
+	date = TestHelpers.datepicker.addMonths(new Date(), 1);
 	date.setDate(date.getDate() + 10);
 	inp.val('').datepicker('show');
 	inp.simulate('keydown', {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
 		simulate('keydown', {keyCode: $.ui.keyCode.ENTER});
-	equalsDate(inp.datepicker('getDate'), date,
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date,
 		'Min/max - -1w, +1 M +10 D - ctrl+pgdn');
 	// With existing date
-	inp = init('#inp');
+	inp = TestHelpers.datepicker.init('#inp');
 	inp.val('06/04/2008').datepicker('option', {minDate: minDate});
-	equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min');
 	inp.datepicker('option', {minDate: null}).val('01/04/2008').datepicker('option', {minDate: minDate});
-	equalsDate(inp.datepicker('getDate'), minDate, 'Min/max - setDate < min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate, 'Min/max - setDate < min');
 	inp.datepicker('option', {minDate: null}).val('06/04/2008').datepicker('option', {maxDate: maxDate});
-	equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate < max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate < max');
 	inp.datepicker('option', {maxDate: null}).val('01/04/2009').datepicker('option', {maxDate: maxDate});
-	equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max');
 	inp.datepicker('option', {maxDate: null}).val('01/04/2008').datepicker('option', {minDate: minDate, maxDate: maxDate});
-	equalsDate(inp.datepicker('getDate'), minDate, 'Min/max - setDate < min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate, 'Min/max - setDate < min');
 	inp.datepicker('option', {maxDate: null}).val('06/04/2008').datepicker('option', {minDate: minDate, maxDate: maxDate});
-	equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min, < max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min, < max');
 	inp.datepicker('option', {maxDate: null}).val('01/04/2009').datepicker('option', {minDate: minDate, maxDate: maxDate});
-	equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max');
 });
 
 test('setDate', function() {
 	expect( 24 );
 	var inl, alt, minDate, maxDate, dateAndTimeToSet, dateAndTimeClone,
-		inp = init('#inp'),
+		inp = TestHelpers.datepicker.init('#inp'),
 		date1 = new Date(2008, 6 - 1, 4),
 		date2 = new Date();
 	ok(inp.datepicker('getDate') == null, 'Set date - default');
 	inp.datepicker('setDate', date1);
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - 2008-06-04');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - 2008-06-04');
 	date1 = new Date();
 	date1.setDate(date1.getDate() + 7);
 	inp.datepicker('setDate', +7);
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - +7');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - +7');
 	date2.setFullYear(date2.getFullYear() + 2);
 	inp.datepicker('setDate', '+2y');
-	equalsDate(inp.datepicker('getDate'), date2, 'Set date - +2y');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date2, 'Set date - +2y');
 	inp.datepicker('setDate', date1, date2);
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - two dates');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - two dates');
 	inp.datepicker('setDate');
 	ok(inp.datepicker('getDate') == null, 'Set date - null');
 	// Relative to current date
 	date1 = new Date();
 	date1.setDate(date1.getDate() + 7);
 	inp.datepicker('setDate', 'c +7');
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - c +7');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - c +7');
 	date1.setDate(date1.getDate() + 7);
 	inp.datepicker('setDate', 'c+7');
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - c+7');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - c+7');
 	date1.setDate(date1.getDate() - 21);
 	inp.datepicker('setDate', 'c -3 w');
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date - c -3 w');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date - c -3 w');
 	// Inline
-	inl = init('#inl');
+	inl = TestHelpers.datepicker.init('#inl');
 	date1 = new Date(2008, 6 - 1, 4);
 	date2 = new Date();
-	equalsDate(inl.datepicker('getDate'), date2, 'Set date inline - default');
+	TestHelpers.datepicker.equalsDate(inl.datepicker('getDate'), date2, 'Set date inline - default');
 	inl.datepicker('setDate', date1);
-	equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - 2008-06-04');
+	TestHelpers.datepicker.equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - 2008-06-04');
 	date1 = new Date();
 	date1.setDate(date1.getDate() + 7);
 	inl.datepicker('setDate', +7);
-	equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - +7');
+	TestHelpers.datepicker.equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - +7');
 	date2.setFullYear(date2.getFullYear() + 2);
 	inl.datepicker('setDate', '+2y');
-	equalsDate(inl.datepicker('getDate'), date2, 'Set date inline - +2y');
+	TestHelpers.datepicker.equalsDate(inl.datepicker('getDate'), date2, 'Set date inline - +2y');
 	inl.datepicker('setDate', date1, date2);
-	equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - two dates');
+	TestHelpers.datepicker.equalsDate(inl.datepicker('getDate'), date1, 'Set date inline - two dates');
 	inl.datepicker('setDate');
 	ok(inl.datepicker('getDate') == null, 'Set date inline - null');
 	// Alternate field
@@ -462,23 +462,23 @@ test('setDate', function() {
 	equal(inp.val(), '06/04/2008', 'Set date alternate - 06/04/2008');
 	equal(alt.val(), '2008-06-04', 'Set date alternate - 2008-06-04');
 	// With minimum/maximum
-	inp = init('#inp');
+	inp = TestHelpers.datepicker.init('#inp');
 	date1 = new Date(2008, 1 - 1, 4);
 	date2 = new Date(2008, 6 - 1, 4);
 	minDate = new Date(2008, 2 - 1, 29);
 	maxDate = new Date(2008, 3 - 1, 28);
 	inp.val('').datepicker('option', {minDate: minDate}).datepicker('setDate', date2);
-	equalsDate(inp.datepicker('getDate'), date2, 'Set date min/max - setDate > min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date2, 'Set date min/max - setDate > min');
 	inp.datepicker('setDate', date1);
-	equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
 	inp.val('').datepicker('option', {maxDate: maxDate, minDate: null}).datepicker('setDate', date1);
-	equalsDate(inp.datepicker('getDate'), date1, 'Set date min/max - setDate < max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), date1, 'Set date min/max - setDate < max');
 	inp.datepicker('setDate', date2);
-	equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
 	inp.val('').datepicker('option', {minDate: minDate}).datepicker('setDate', date1);
-	equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), minDate, 'Set date min/max - setDate < min');
 	inp.datepicker('setDate', date2);
-	equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
+	TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Set date min/max - setDate > max');
 	dateAndTimeToSet = new Date(2008, 3 - 1, 28, 1, 11, 0);
 	dateAndTimeClone = new Date(2008, 3 - 1, 28, 1, 11, 0);
 	inp.datepicker('setDate', dateAndTimeToSet);
@@ -487,7 +487,7 @@ test('setDate', function() {
 
 test('altField', function() {
 	expect( 10 );
-	var inp = init('#inp'),
+	var inp = TestHelpers.datepicker.init('#inp'),
 		alt = $('#alt');
 	// No alternate field set
 	alt.val('');
@@ -526,7 +526,7 @@ test('altField', function() {
 
 test('autoSize', function() {
 	expect( 15 );
-	var inp = init('#inp');
+	var inp = TestHelpers.datepicker.init('#inp');
 	equal(inp.prop('size'), 20, 'Auto size - default');
 	inp.datepicker('option', 'autoSize', true);
 	equal(inp.prop('size'), 10, 'Auto size - mm/dd/yy');
@@ -562,7 +562,7 @@ test('autoSize', function() {
 
 test('daylightSaving', function() {
 	expect( 25 );
-	var inp = init('#inp'),
+	var inp = TestHelpers.datepicker.init('#inp'),
 		dp = $('#ui-datepicker-div');
 	ok(true, 'Daylight saving - ' + new Date());
 	// Australia, Sydney - AM change, southern hemisphere
@@ -669,7 +669,7 @@ test('callbacks', function() {
 	expect( 13 );
 	// Before show
 	var dp, day20, day21,
-		inp = init('#inp', {beforeShow: beforeAll}),
+		inp = TestHelpers.datepicker.init('#inp', {beforeShow: beforeAll}),
 		inst = $.data(inp[0], 'datepicker');
 	equal($.datepicker._get(inst, 'currentText'), 'Today', 'Before show - initial');
 	inp.val('02/04/2008').datepicker('show');
@@ -679,7 +679,7 @@ test('callbacks', function() {
 	deepEqual(beforeShowInst, inst, 'Before show - inst OK');
 	inp.datepicker('hide').datepicker('destroy');
 	// Before show day
-	inp = init('#inp', {beforeShowDay: beforeDay});
+	inp = TestHelpers.datepicker.init('#inp', {beforeShowDay: beforeDay});
 	dp = $('#ui-datepicker-div');
 	inp.val('02/04/2008').datepicker('show');
 	ok(beforeShowDayThis.id === inp[0].id, 'Before show day - this OK');
@@ -698,7 +698,7 @@ test('callbacks', function() {
 test('localisation', function() {
 	expect( 24 );
 	var dp, month, day, date,
-		inp = init('#inp', $.datepicker.regional.fr);
+		inp = TestHelpers.datepicker.init('#inp', $.datepicker.regional.fr);
 	inp.datepicker('option', {dateFormat: 'DD, d MM yy', showButtonPanel:true, changeMonth:true, changeYear:true}).val('').datepicker('show');
 	dp = $('#ui-datepicker-div');
 	equal($('.ui-datepicker-close', dp).text(), 'Fermer', 'Localisation - close');
@@ -765,72 +765,72 @@ test('iso8601Week', function() {
 
 test('parseDate', function() {
 	expect( 26 );
-	init('#inp');
+	TestHelpers.datepicker.init('#inp');
 	var currentYear, gmtDate, fr, settings, zh;
 	ok($.datepicker.parseDate('d m y', '') == null, 'Parse date empty');
-	equalsDate($.datepicker.parseDate('d m y', '3 2 01'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('dd mm yy', '13 12 2001'),
 		new Date(2001, 12 - 1, 13), 'Parse date dd mm yy');
-	equalsDate($.datepicker.parseDate('y-o', '01-34'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-o', '01-34'),
 		new Date(2001, 2 - 1, 3), 'Parse date y-o');
-	equalsDate($.datepicker.parseDate('yy-oo', '2001-347'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('yy-oo', '2001-347'),
 		new Date(2001, 12 - 1, 13), 'Parse date yy-oo');
-	equalsDate($.datepicker.parseDate('oo yy', '348 2004'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.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'),
+	TestHelpers.datepicker.equalsDate($.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',
+	TestHelpers.datepicker.equalsDate($.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');
 	currentYear = new Date().getFullYear();
-	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
 			new Date(currentYear, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
-	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
 			new Date(currentYear+10, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
-	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 11) + '-02-03'),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 11) + '-02-03'),
 			new Date(currentYear-89, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
-	equalsDate($.datepicker.parseDate('y-m-d', '80-02-03', {shortYearCutoff: 80}),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', '80-02-03', {shortYearCutoff: 80}),
 		new Date(2080, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
-	equalsDate($.datepicker.parseDate('y-m-d', '81-02-03', {shortYearCutoff: 80}),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', '81-02-03', {shortYearCutoff: 80}),
 		new Date(1981, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
-	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 60) + '-02-03', {shortYearCutoff: '+60'}),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 60) + '-02-03', {shortYearCutoff: '+60'}),
 			new Date(currentYear + 60, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
-	equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
 			new Date(currentYear - 39, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
 	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 !');
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse date @');
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('!', '631167552000000000'), gmtDate, 'Parse date !');
 	fr = $.datepicker.regional.fr;
 	settings = {dayNamesShort: fr.dayNamesShort, dayNames: fr.dayNames,
 		monthNamesShort: fr.monthNamesShort, monthNames: fr.monthNames};
-	equalsDate($.datepicker.parseDate('D d M y', 'Lun. 9 Avril 01', settings),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('D d M y', 'Lun. 9 Avril 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),
+	TestHelpers.datepicker.equalsDate($.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),
+	TestHelpers.datepicker.equalsDate($.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',
+	TestHelpers.datepicker.equalsDate($.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');
 
 	zh = $.datepicker.regional['zh-CN'];
-	equalsDate($.datepicker.parseDate('yy M d', '2011 十一 22', zh),
+	TestHelpers.datepicker.equalsDate($.datepicker.parseDate('yy M d', '2011 十一 22', zh),
 		new Date(2011, 11 - 1, 22), 'Parse date yy M d with zh-CN');
 });
 
 test('parseDateErrors', function() {
 	expect( 17 );
-	init('#inp');
+	TestHelpers.datepicker.init('#inp');
 	var fr, settings;
 	function expectError(expr, value, error) {
 		try {
@@ -883,7 +883,7 @@ test('parseDateErrors', function() {
 
 test('formatDate', function() {
 	expect( 16 );
-	init('#inp');
+	TestHelpers.datepicker.init('#inp');
 	var gmtDate, fr, settings;
 	equal($.datepicker.formatDate('d m y', new Date(2001, 2 - 1, 3)),
 		'3 2 01', 'Format date d m y');