Merge branch 'master' into core-1.6.1

Conflicts:
	demos/menubar/default.html
	tests/unit/autocomplete/autocomplete.html
	tests/visual/effects/effects.all.html
	ui/jquery.ui.menu.js
	ui/jquery.ui.popup.js

7 files changed, 152 insertions, 112 deletions

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index ec97b867b..5cb972bb7 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -25,17 +25,17 @@
 		var actual = accordion.find( ".ui-accordion-content" ).map(function() {
 			return $( this ).css( "display" ) === "none" ? 0 : 1;
 		}).get();
-		same( actual, expected );
+		deepEqual( actual, expected );
 	}
-	function equalHeights( accordion, min, max ) {
+	function accordion_equalHeights( accordion, min, max ) {
 		var sizes = [];
 		accordion.find( ".ui-accordion-content" ).each(function() {
 			sizes.push( $( this ).outerHeight() );
 		});
 		ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
 			"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
-		same( sizes[ 0 ], sizes[ 1 ] );
-		same( sizes[ 0 ], sizes[ 2 ] );
+		deepEqual( sizes[ 0 ], sizes[ 1 ] );
+		deepEqual( sizes[ 0 ], sizes[ 2 ] );
 	}
 	function accordionSetupTeardown() {
 		var animated = $.ui.accordion.prototype.options.animated;
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 280339c26..ec4ca29d5 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -3,6 +3,7 @@
 module( "accordion: core", accordionSetupTeardown() );
 
 $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) {
+	expect( 4 );
 	test( "markup structure: " + type, function() {
 		var element = $( selector ).accordion();
 		ok( element.hasClass( "ui-accordion" ), "main element is .ui-accordion" );
@@ -10,13 +11,14 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
 			".ui-accordion-header elements exist, correct number" );
 		equal( element.find( ".ui-accordion-content" ).length, 3,
 			".ui-accordion-content elements exist, correct number" );
-		same( element.find( ".ui-accordion-header" ).next().get(),
+		deepEqual( element.find( ".ui-accordion-header" ).next().get(),
 			element.find( ".ui-accordion-content" ).get(),
 			"content panels come immediately after headers" );
 	});
 });
 
 test( "handle click on header-descendant", function() {
+	expect( 1 );
 	var element = $( "#navigation" ).accordion();
 	$( "#navigation h2:eq(1) a" ).click();
 	accordion_state( element, 0, 1, 0 );
@@ -26,7 +28,7 @@ test( "ui-accordion-heading class added to headers anchor", function() {
 	expect( 1 );
 	var element = $( "#list1" ).accordion();
 	var anchors = element.find( ".ui-accordion-heading" );
-	equals( anchors.length, 3 );
+	equal( anchors.length, 3 );
 });
 
 test( "accessibility", function () {
@@ -34,20 +36,20 @@ test( "accessibility", function () {
 	var element = $( "#list1" ).accordion().accordion( "option", "active", 1 );
 	var headers = element.find( ".ui-accordion-header" );
 
-	equals( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
-	equals( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
-	equals( element.attr( "role" ), "tablist", "main role" );
-	equals( headers.attr( "role" ), "tab", "tab roles" );
-	equals( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
-	equals( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
-	equals( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
-	equals( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
-	equals( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
+	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
+	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
+	equal( element.attr( "role" ), "tablist", "main role" );
+	equal( headers.attr( "role" ), "tab", "tab roles" );
+	equal( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
 	element.accordion( "option", "active", 0 );
-	equals( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
-	equals( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
-	equals( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
-	equals( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
+	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
+	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
 });
 
 }( jQuery ) );
diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index e43b4eb22..d1294390a 100644
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -22,17 +22,17 @@
 		var actual = accordion.find( ".ui-accordion-content" ).map(function() {
 			return $( this ).css( "display" ) === "none" ? 0 : 1;
 		}).get();
-		same( actual, expected );
+		deepEqual( actual, expected );
 	}
-	function equalHeights( accordion, min, max ) {
+	function accordion_equalHeights( accordion, min, max ) {
 		var sizes = [];
 		accordion.find( ".ui-accordion-content" ).each(function() {
 			sizes.push( $( this ).outerHeight() );
 		});
 		ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
 			"must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
-		same( sizes[ 0 ], sizes[ 1 ] );
-		same( sizes[ 0 ], sizes[ 2 ] );
+		deepEqual( sizes[ 0 ], sizes[ 1 ] );
+		deepEqual( sizes[ 0 ], sizes[ 2 ] );
 	}
 	function accordionSetupTeardown() {
 		var animated = $.ui.accordion.prototype.options.animated;
diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index 0435f48a7..3a2075b2b 100644
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -3,6 +3,7 @@
 module( "accordion (deprecated): expanded active option, activate method", accordionSetupTeardown() );
 
 test( "activate, numeric", function() {
+	expect( 5 );
 	var element = $( "#list1" ).accordion({ active: 1 });
 	accordion_state( element, 0, 1, 0 );
 	element.accordion( "activate", 2 );
@@ -16,6 +17,7 @@ test( "activate, numeric", function() {
 });
 
 test( "activate, numeric, collapsible:true", function() {
+	expect( 3 );
 	var element = $( "#list1" ).accordion({ collapsible: true });
 	element.accordion( "activate", 2 );
 	accordion_state( element, 0, 0, 1 );
@@ -26,6 +28,7 @@ test( "activate, numeric, collapsible:true", function() {
 });
 
 test( "activate, boolean, collapsible: true", function() {
+	expect( 2 );
 	var element = $( "#list1" ).accordion({ collapsible: true });
 	element.accordion( "activate", 2 );
 	accordion_state( element, 0, 0, 1 );
@@ -34,6 +37,7 @@ test( "activate, boolean, collapsible: true", function() {
 });
 
 test( "activate, boolean, collapsible: false", function() {
+	expect( 2 );
 	var element = $( "#list1" ).accordion();
 	element.accordion( "activate", 2 );
 	accordion_state( element, 0, 0, 1 );
@@ -42,6 +46,7 @@ test( "activate, boolean, collapsible: false", function() {
 });
 
 test( "activate, string expression", function() {
+	expect( 4 );
 	var element = $( "#list1" ).accordion({ active: "h3:last" });
 	accordion_state( element, 0, 0, 1 );
 	element.accordion( "activate", ":first" );
@@ -53,6 +58,7 @@ test( "activate, string expression", function() {
 });
 
 test( "activate, jQuery or DOM element", function() {
+	expect( 3 );
 	var element = $( "#list1" ).accordion({ active: $( "#list1 h3:last" ) });
 	accordion_state( element, 0, 0, 1 );
 	element.accordion( "activate", $( "#list1 h3:first" ) );
@@ -62,6 +68,7 @@ test( "activate, jQuery or DOM element", function() {
 });
 
 test( "{ active: Selector }", function() {
+	expect( 2 );
 	var element = $("#list1").accordion({
 		active: "h3:last"
 	});
@@ -71,6 +78,7 @@ test( "{ active: Selector }", function() {
 });
 
 test( "{ active: Element }", function() {
+	expect( 2 );
 	var element = $( "#list1" ).accordion({
 		active: $( "#list1 h3:last" )[ 0 ]
 	});
@@ -80,6 +88,7 @@ test( "{ active: Element }", function() {
 });
 
 test( "{ active: jQuery Object }", function() {
+	expect( 2 );
 	var element = $( "#list1" ).accordion({
 		active: $( "#list1 h3:last" )
 	});
@@ -95,14 +104,16 @@ test( "{ active: jQuery Object }", function() {
 module( "accordion (deprecated) - height options", accordionSetupTeardown() );
 
 test( "{ autoHeight: true }, default", function() {
-	equalHeights($('#navigation').accordion({ autoHeight: true }), 95, 130);
+	expect( 3 );
+	accordion_equalHeights( $( "#navigation" ).accordion({ autoHeight: true }), 95, 130 );
 });
 
-test("{ autoHeight: false }", function() {
-	var element = $('#navigation').accordion({ autoHeight: false });
+test( "{ autoHeight: false }", function() {
+	expect( 3 );
+	var element = $( "#navigation" ).accordion({ autoHeight: false });
 	var sizes = [];
-	element.find(".ui-accordion-content").each(function() {
-		sizes.push($(this).height());
+	element.find( ".ui-accordion-content" ).each(function() {
+		sizes.push( $(this).height() );
 	});
 	ok( sizes[0] >= 70 && sizes[0] <= 105, "was " + sizes[0] );
 	ok( sizes[1] >= 98 && sizes[1] <= 126, "was " + sizes[1] );
@@ -110,12 +121,14 @@ test("{ autoHeight: false }", function() {
 });
 
 test( "{ fillSpace: true }", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	equalHeights( element, 446, 458 );
+	accordion_equalHeights( element, 446, 458 );
 });
 
 test( "{ fillSapce: true } with sibling", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
 		.css({
@@ -125,10 +138,11 @@ test( "{ fillSapce: true } with sibling", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	equalHeights( element , 346, 358);
+	accordion_equalHeights( element , 346, 358);
 });
 
 test( "{ fillSpace: true } with multiple siblings", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
 		.css({
@@ -153,7 +167,7 @@ test( "{ fillSpace: true } with multiple siblings", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ fillSpace: true });
-	equalHeights( element, 296, 308 );
+	accordion_equalHeights( element, 296, 308 );
 });
 
 
@@ -163,6 +177,7 @@ test( "{ fillSpace: true } with multiple siblings", function() {
 module( "accordion (deprecated) - icons", accordionSetupTeardown() );
 
 test( "icons, headerSelected", function() {
+	expect( 3 );
 	var element = $( "#list1" ).accordion({
 		icons: { headerSelected: "a1", header: "h1" }
 	});
@@ -179,6 +194,7 @@ test( "icons, headerSelected", function() {
 module( "accordion (deprecated) - resize", accordionSetupTeardown() );
 
 test( "resize", function() {
+	expect( 6 );
 	var element = $( "#navigation" )
 		.parent()
 			.height( 300 )
@@ -186,11 +202,11 @@ test( "resize", function() {
 		.accordion({
 			heightStyle: "fill"
 		});
-	equalHeights( element, 246, 258 );
+	accordion_equalHeights( element, 246, 258 );
 
 	element.parent().height( 500 );
 	element.accordion( "resize" );
-	equalHeights( element, 446, 458 );
+	accordion_equalHeights( element, 446, 458 );
 });
 
 
@@ -200,6 +216,7 @@ test( "resize", function() {
 module( "accordion (deprecated) - navigation", accordionSetupTeardown() );
 
 test( "{ navigation: true, navigationFilter: header }", function() {
+	expect( 2 );
 	var element = $( "#navigation" ).accordion({
 		navigation: true,
 		navigationFilter: function() {
@@ -211,10 +228,11 @@ test( "{ navigation: true, navigationFilter: header }", function() {
 });
 
 test( "{ navigation: true, navigationFilter: content }", function() {
-	var element = $("#navigation").accordion({
+	expect( 2 );
+	var element = $( "#navigation" ).accordion({
 		navigation: true,
 		navigationFilter: function() {
-			return /\?p=1\.1\.3\.2$/.test(this.href);
+			return /\?p=1\.1\.3\.2$/.test( this.href );
 		}
 	});
 	equal( element.accordion( "option", "active" ), 2 );
@@ -237,11 +255,11 @@ test( "changestart", function() {
 	var content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equals( ui.oldHeader.size(), 0 );
-		equals( ui.oldContent.size(), 0 );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 0 );
+		equal( ui.oldContent.size(), 0 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 		accordion_state( element, 0, 0, 0 );
 	});
@@ -249,13 +267,13 @@ test( "changestart", function() {
 	accordion_state( element, 1, 0, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 		accordion_state( element, 1, 0, 0 );
 	});
@@ -263,12 +281,12 @@ test( "changestart", function() {
 	accordion_state( element, 0, 1, 0 );
 
 	element.one( "accordionchangestart", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equals( ui.newHeader.size(), 0 );
-		equals( ui.newContent.size(), 0 );
+		equal( ui.newHeader.size(), 0 );
+		equal( ui.newContent.size(), 0 );
 		accordion_state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
@@ -285,34 +303,34 @@ test( "change", function() {
 	var content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionchange", function( event, ui ) {
-		equals( ui.oldHeader.size(), 0 );
-		equals( ui.oldContent.size(), 0 );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 0 );
+		equal( ui.oldContent.size(), 0 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 	});
 	element.accordion( "option", "active", 0 );
 
 	element.one( "accordionchange", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 	});
 	headers.eq( 1 ).click();
 
 	element.one( "accordionchange", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equals( ui.newHeader.size(), 0 );
-		equals( ui.newContent.size(), 0 );
+		equal( ui.newHeader.size(), 0 );
+		equal( ui.newContent.size(), 0 );
 	});
 	element.accordion( "option", "active", false );
 });
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 2438f28ea..d704e54c8 100644
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -13,11 +13,11 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equals( ui.oldHeader.size(), 0 );
-		equals( ui.oldContent.size(), 0 );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 0 );
+		equal( ui.oldContent.size(), 0 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 		accordion_state( element, 0, 0, 0 );
 	});
@@ -25,14 +25,14 @@ test( "beforeActivate", function() {
 	accordion_state( element, 1, 0, 0 );
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
-		equals( event.originalEvent.type, "click" );
-		equals( ui.oldHeader.size(), 1 );
+		equal( event.originalEvent.type, "click" );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 		accordion_state( element, 1, 0, 0 );
 	});
@@ -41,12 +41,12 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equals( ui.newHeader.size(), 0 );
-		equals( ui.newContent.size(), 0 );
+		equal( ui.newHeader.size(), 0 );
+		equal( ui.newContent.size(), 0 );
 		accordion_state( element, 0, 1, 0 );
 	});
 	element.accordion( "option", "active", false );
@@ -54,11 +54,11 @@ test( "beforeActivate", function() {
 
 	element.one( "accordionbeforeactivate", function( event, ui ) {
 		ok( !( "originalEvent" in event ) );
-		equals( ui.oldHeader.size(), 0 );
-		equals( ui.oldContent.size(), 0 );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 0 );
+		equal( ui.oldContent.size(), 0 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 2 ] );
 		event.preventDefault();
 		accordion_state( element, 0, 0, 0 );
@@ -77,34 +77,34 @@ test( "activate", function() {
 	var content = element.find( ".ui-accordion-content" );
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equals( ui.oldHeader.size(), 0 );
-		equals( ui.oldContent.size(), 0 );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 0 );
+		equal( ui.oldContent.size(), 0 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
 	});
 	element.accordion( "option", "active", 0 );
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equals( ui.newHeader.size(), 1 );
+		equal( ui.newHeader.size(), 1 );
 		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equals( ui.newContent.size(), 1 );
+		equal( ui.newContent.size(), 1 );
 		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
 	});
 	headers.eq( 1 ).click();
 
 	element.one( "accordionactivate", function( event, ui ) {
-		equals( ui.oldHeader.size(), 1 );
+		equal( ui.oldHeader.size(), 1 );
 		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equals( ui.oldContent.size(), 1 );
+		equal( ui.oldContent.size(), 1 );
 		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equals( ui.newHeader.size(), 0 );
-		equals( ui.newContent.size(), 0 );
+		equal( ui.newHeader.size(), 0 );
+		equal( ui.newContent.size(), 0 );
 	});
 	element.accordion( "option", "active", false );
 
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
index d45bde134..c6ba3230a 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/accordion_methods.js
@@ -3,13 +3,15 @@
 module( "accordion: methods", accordionSetupTeardown() );
 
 test( "destroy", function() {
-	domEqual("#list1", function() {
-		$("#list1").accordion().accordion("destroy");
+	expect( 1 );
+	domEqual( "#list1", function() {
+		$( "#list1" ).accordion().accordion( "destroy" );
 	});
 });
 
 test( "enable/disable", function() {
-	var element = $('#list1').accordion();
+	expect( 3 );
+	var element = $( "#list1" ).accordion();
 	accordion_state( element, 1, 0, 0 );
 	element.accordion( "disable" );
 	element.accordion( "option", "active", 1 );
@@ -20,6 +22,7 @@ test( "enable/disable", function() {
 });
 
 test( "refresh", function() {
+	expect( 6 );
 	var element = $( "#navigation" )
 		.parent()
 			.height( 300 )
@@ -27,11 +30,11 @@ test( "refresh", function() {
 		.accordion({
 			heightStyle: "fill"
 		});
-	equalHeights( element, 246, 258 );
+	accordion_equalHeights( element, 246, 258 );
 
 	element.parent().height( 500 );
 	element.accordion( "refresh" );
-	equalHeights( element, 446, 458 );
+	accordion_equalHeights( element, 446, 458 );
 });
 
 }( jQuery ) );
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 7bd6f2e74..80b7f0b39 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -3,23 +3,25 @@
 module( "accordion: options", accordionSetupTeardown() );
 
 test( "{ active: default }", function() {
+	expect( 2 );
 	var element = $( "#list1" ).accordion();
-	equals( element.accordion( "option", "active" ), 0 );
+	equal( element.accordion( "option", "active" ), 0 );
 	accordion_state( element, 1, 0, 0 );
 });
 
 test( "{ active: false }", function() {
+	expect( 7 );
 	var element = $( "#list1" ).accordion({
 		active: false,
 		collapsible: true
 	});
 	accordion_state( element, 0, 0, 0 );
-	equals( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
-	equals( element.accordion( "option", "active" ), false );
+	equal( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
+	equal( element.accordion( "option", "active" ), false );
 
 	element.accordion( "option", "collapsible", false );
 	accordion_state( element, 1, 0, 0 );
-	equals( element.accordion( "option", "active" ), 0 );
+	equal( element.accordion( "option", "active" ), 0 );
 
 	element.accordion( "destroy" );
 	element.accordion({
@@ -30,43 +32,45 @@ test( "{ active: false }", function() {
 });
 
 test( "{ active: Number }", function() {
+	expect( 8 );
 	var element = $( "#list1" ).accordion({
 		active: 2
 	});
-	equals( element.accordion( "option", "active" ), 2 );
+	equal( element.accordion( "option", "active" ), 2 );
 	accordion_state( element, 0, 0, 1 );
 
 	element.accordion( "option", "active", 0 );
-	equals( element.accordion( "option", "active" ), 0 );
+	equal( element.accordion( "option", "active" ), 0 );
 	accordion_state( element, 1, 0, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).click();
-	equals( element.accordion( "option", "active" ), 1 );
+	equal( element.accordion( "option", "active" ), 1 );
 	accordion_state( element, 0, 1, 0 );
 
 	element.accordion( "option", "active", 10 );
-	equals( element.accordion( "option", "active" ), 1 );
+	equal( element.accordion( "option", "active" ), 1 );
 	accordion_state( element, 0, 1, 0 );
 });
 
 if ( $.uiBackCompat === false ) {
 	test( "{ active: -Number }", function() {
+		expect( 8 );
 		var element = $( "#list1" ).accordion({
 			active: -1
 		});
-		equals( element.accordion( "option", "active" ), 2 );
+		equal( element.accordion( "option", "active" ), 2 );
 		accordion_state( element, 0, 0, 1 );
 
 		element.accordion( "option", "active", -2 );
-		equals( element.accordion( "option", "active" ), 1 );
+		equal( element.accordion( "option", "active" ), 1 );
 		accordion_state( element, 0, 1, 0 );
 
 		element.accordion( "option", "active", -10 );
-		equals( element.accordion( "option", "active" ), 1 );
+		equal( element.accordion( "option", "active" ), 1 );
 		accordion_state( element, 0, 1, 0 );
 
 		element.accordion( "option", "active", -3 );
-		equals( element.accordion( "option", "active" ), 0 );
+		equal( element.accordion( "option", "active" ), 0 );
 		accordion_state( element, 1, 0, 0 );
 	});
 }
@@ -74,6 +78,7 @@ if ( $.uiBackCompat === false ) {
 // TODO: add animation tests
 
 test( "{ collapsible: false }", function() {
+	expect( 4 );
 	var element = $( "#list1" ).accordion({
 		active: 1
 	});
@@ -87,6 +92,7 @@ test( "{ collapsible: false }", function() {
 });
 
 test( "{ collapsible: true }", function() {
+	expect( 6 );
 	var element = $( "#list1" ).accordion({
 		active: 1,
 		collapsible: true
@@ -101,11 +107,12 @@ test( "{ collapsible: true }", function() {
 	accordion_state( element, 0, 1, 0 );
 
 	element.find( ".ui-accordion-header" ).eq( 1 ).click();
-	equals( element.accordion( "option", "active" ), false );
+	equal( element.accordion( "option", "active" ), false );
 	accordion_state( element, 0, 0, 0 );
 });
 
 test( "{ event: null }", function() {
+	expect( 5 );
 	var element = $( "#list1" ).accordion({
 		event: null
 	});
@@ -122,6 +129,7 @@ test( "{ event: null }", function() {
 });
 
 test( "{ event: custom }", function() {
+	expect( 11 );
 	var element = $( "#list1" ).accordion({
 		event: "custom1 custom2"
 	});
@@ -153,6 +161,7 @@ test( "{ event: custom }", function() {
 });
 
 test( "{ header: default }", function() {
+	expect( 2 );
 	// default: > li > :first-child,> :not(li):even
 	// > :not(li):even
 	accordion_state( $( "#list1" ).accordion(), 1, 0, 0);
@@ -161,6 +170,7 @@ test( "{ header: default }", function() {
 });
 
 test( "{ header: custom }", function() {
+	expect( 6 );
 	var element = $( "#navigationWrapper" ).accordion({
 		header: "h2"
 	});
@@ -174,11 +184,13 @@ test( "{ header: custom }", function() {
 });
 
 test( "{ heightStyle: 'auto' }", function() {
+	expect( 3 );
 	var element = $( "#navigation" ).accordion({ heightStyle: "auto" });
-	equalHeights( element, 95, 130 );
+	accordion_equalHeights( element, 95, 130 );
 });
 
 test( "{ heightStyle: 'content' }", function() {
+	expect( 3 );
 	var element = $( "#navigation" ).accordion({ heightStyle: "content" });
 	var sizes = element.find( ".ui-accordion-content" ).map(function() {
 		return $( this ).height();
@@ -189,12 +201,14 @@ test( "{ heightStyle: 'content' }", function() {
 });
 
 test( "{ heightStyle: 'fill' }", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeights( element, 446, 458 );
+	accordion_equalHeights( element, 446, 458 );
 });
 
 test( "{ heightStyle: 'fill' } with sibling", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
 		.css({
@@ -204,10 +218,11 @@ test( "{ heightStyle: 'fill' } with sibling", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeights( element , 346, 358);
+	accordion_equalHeights( element , 346, 358);
 });
 
 test( "{ heightStyle: 'fill' } with multiple siblings", function() {
+	expect( 3 );
 	$( "#navigationWrapper" ).height( 500 );
 	$( "<p>Lorem Ipsum</p>" )
 		.css({
@@ -232,14 +247,15 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
 		})
 		.prependTo( "#navigationWrapper" );
 	var element = $( "#navigation" ).accordion({ heightStyle: "fill" });
-	equalHeights( element, 296, 308 );
+	accordion_equalHeights( element, 296, 308 );
 });
 
 test( "{ icons: false }", function() {
+	expect( 8 );
 	var element = $( "#list1" );
 	function icons( on ) {
-		same( element.find( "span.ui-icon").length, on ? 3 : 0 );
-		same( element.hasClass( "ui-accordion-icons" ), on );
+		deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
+		deepEqual( element.hasClass( "ui-accordion-icons" ), on );
 	}
 	element.accordion();
 	icons( true );
@@ -254,6 +270,7 @@ test( "{ icons: false }", function() {
 });
 
 test( "{ icons: hash }", function() {
+	expect( 3 );
 	var element = $( "#list1" ).accordion({
 		icons: { activeHeader: "a1", header: "h1" }
 	});