From 13647e94e0141757a17c8445d398b64e70393b5c Mon Sep 17 00:00:00 2001
From: Rick Waldron <waldron.rick@gmail.com>
Date: Fri, 5 Aug 2011 10:02:33 -0400
Subject: [PATCH] Fixes assertion counts and dom element fixture issue

---
 test/index.html         |  3 +--
 test/unit/attributes.js | 28 ++++++++++++++--------------
 test/unit/traversing.js | 16 ++++++++--------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/test/index.html b/test/index.html
index a001e7435..4bbef54cd 100644
--- a/test/index.html
+++ b/test/index.html
@@ -229,6 +229,7 @@ Z</textarea>
 			<div id="t6652">
 				<div></div>
 			</div>
+			<div id="no-clone-exception"><object><embed></embed></object></div>
 		</div>
 
 		<div id="tabindex-tests">
@@ -284,8 +285,6 @@ Z</textarea>
 		</div>
 
 		<div id="fx-tests"></div>
-
-		<div id="no-clone-exception"><object><embed></embed></object></div>
 	</div>
 </body>
 </html>
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 73e7750fc..eaaaa6235 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -6,7 +6,7 @@ var functionReturningObj = function(value) { return (function() { return value;
 
 test("jQuery.attrFix/jQuery.propFix integrity test", function() {
 	expect(2);
-	
+
 	//  This must be maintained and equal jQuery.attrFix when appropriate
 	//  Ensure that accidental or erroneous property
 	//  overwrites don't occur
@@ -52,7 +52,7 @@ test("attr(String)", function() {
 	equals( jQuery("<div value='t'></div>").attr("value"), "t", "Check setting custom attr named 'value' on a div" );
 	equals( jQuery("#form").attr("blah", "blah").attr("blah"), "blah", "Set non-existant attribute on a form" );
 	equals( jQuery("#foo").attr("height"), undefined, "Non existent height attribute should return undefined" );
-	
+
 	// [7472] & [3113] (form contains an input with name="action" or name="id")
 	var extras = jQuery("<input name='id' name='name' /><input id='target' name='target' />").appendTo("#testForm");
 	equals( jQuery("#form").attr("action","newformaction").attr("action"), "newformaction", "Check that action attribute was changed" );
@@ -62,7 +62,7 @@ test("attr(String)", function() {
 	// Bug #3685 (form contains input with name="name")
 	equals( jQuery("#testForm").attr("name"), undefined, "Retrieving name does not retrieve input with name=name" );
 	extras.remove();
-	
+
 	equals( jQuery("#text1").attr("maxlength"), "30", "Check for maxlength attribute" );
 	equals( jQuery("#text1").attr("maxLength"), "30", "Check for maxLength attribute" );
 	equals( jQuery("#area1").attr("maxLength"), "30", "Check for maxLength attribute" );
@@ -255,7 +255,7 @@ test("attr(String, Object)", function() {
 		commentNode = document.createComment("some comment"),
 		textNode = document.createTextNode("some text"),
 		obj = {};
-	
+
 	jQuery.each( [commentNode, textNode, attributeNode], function( i, elem ) {
 		var $elem = jQuery( elem );
 		$elem.attr( "nonexisting", "foo" );
@@ -295,7 +295,7 @@ test("attr(String, Object)", function() {
 	j.removeAttr("name");
 
 	QUnit.reset();
-	
+
 	// Type
 	var type = jQuery("#check2").attr("type");
 	var thrown = false;
@@ -457,7 +457,7 @@ test("removeAttr(String)", function() {
 	equals( jQuery("#foo").attr("style", "position:absolute;").removeAttr("style").attr("style"), undefined, "Check removing style attribute" );
 	equals( jQuery("#form").attr("style", "position:absolute;").removeAttr("style").attr("style"), undefined, "Check removing style attribute on a form" );
 	equals( jQuery("#fx-test-group").attr("height", "3px").removeAttr("height").css("height"), "1px", "Removing height attribute has no effect on height set with style attribute" );
-	
+
 	jQuery("#check1").removeAttr("checked").prop("checked", true).removeAttr("checked");
 	equals( document.getElementById("check1").checked, false, "removeAttr sets boolean properties to false" );
 	jQuery("#text1").prop("readOnly", true).removeAttr("readonly");
@@ -669,11 +669,11 @@ test("val()", function() {
 	var $button = jQuery("<button value='foobar'>text</button>").insertAfter("#button");
 	equals( $button.val(), "foobar", "Value retrieval on a button does not return innerHTML" );
 	equals( $button.val("baz").html(), "text", "Setting the value does not change innerHTML" );
-	
+
 	equals( jQuery("<option/>").val("test").attr("value"), "test", "Setting value sets the value attribute" );
 });
 
-if ( "value" in document.createElement("meter") && 
+if ( "value" in document.createElement("meter") &&
 			"value" in document.createElement("progress") ) {
 
 	test("val() respects numbers without exception (Bug #9319)", function() {
@@ -820,7 +820,7 @@ test("val(select) after form.reset() (Bug #2551)", function() {
 	same( jQuery("#select3").val(), ["1", "2"], "Call val() on a multiple=\"multiple\" select" );
 
 	jQuery("#kk").remove();
-}); 
+});
 
 var testAddClass = function(valueObj) {
 	expect(9);
@@ -852,7 +852,7 @@ var testAddClass = function(valueObj) {
 	div.attr("class", "foo");
 	div.addClass( valueObj("bar baz") );
 	equals( div.attr("class"), "foo bar baz", "Make sure there isn't too much trimming." );
-	
+
 	div.removeClass();
 	div.addClass( valueObj("foo") ).addClass( valueObj("foo") )
 	equal( div.attr("class"), "foo", "Do not add the same class twice in separate calls." );
@@ -876,11 +876,11 @@ test("addClass(Function)", function() {
 });
 
 test("addClass(Function) with incoming value", function() {
-	expect(45);
+	expect(48);
 	var div = jQuery("div"), old = div.map(function(){
 		return jQuery(this).attr("class") || "";
 	});
-	
+
 	div.addClass(function(i, val) {
 		if ( this.id !== "_firebugConsole") {
 			equals( val, old[i], "Make sure the incoming value is correct." );
@@ -948,7 +948,7 @@ test("removeClass(Function) - simple", function() {
 });
 
 test("removeClass(Function) with incoming value", function() {
-	expect(45);
+	expect(48);
 
 	var $divs = jQuery("div").addClass("test"), old = $divs.map(function(){
 		return jQuery(this).attr("class");
@@ -1120,7 +1120,7 @@ test("addClass, removeClass, hasClass", function() {
 test("contents().hasClass() returns correct values", function() {
 	expect(2);
 
-	var $div = jQuery("<div><span class='foo'></span><!-- comment -->text</div>"), 
+	var $div = jQuery("<div><span class='foo'></span><!-- comment -->text</div>"),
 	$contents = $div.contents();
 
 	ok( $contents.hasClass("foo"), "Found 'foo' in $contents" );
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 70c142597..37ac20e82 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -15,7 +15,7 @@ test("find(String)", function() {
 
 test("find(node|jQuery object)", function() {
 	expect( 11 );
-	
+
 	var $foo = jQuery("#foo"),
 		$blog = jQuery(".blogTest"),
 		$first = jQuery("#first"),
@@ -29,12 +29,12 @@ test("find(node|jQuery object)", function() {
 	ok( $foo.find( $two ).is(".blogTest"), "Find returns only nodes within #foo" );
 	ok( $fooTwo.find( $blog ).is(".blogTest"), "Blog is part of the collection, but also within foo" );
 	ok( $fooTwo.find( $blog[0] ).is(".blogTest"), "Blog is part of the collection, but also within foo(node)" );
-	
+
 	equals( $two.find( $foo ).length, 0, "Foo is not in two elements" );
 	equals( $two.find( $foo[0] ).length, 0, "Foo is not in two elements(node)" );
 	equals( $two.find( $first ).length, 0, "first is in the collection and not within two" );
 	equals( $two.find( $first ).length, 0, "first is in the collection and not within two(node)" );
-	
+
 });
 
 test("is(String|undefined)", function() {
@@ -63,7 +63,7 @@ test("is(String|undefined)", function() {
 	ok( !jQuery("#foo").is(""), "Expected false for an invalid expression - \"\"" );
 	ok( !jQuery("#foo").is(undefined), "Expected false for an invalid expression - undefined" );
 	ok( !jQuery("#foo").is({ plain: "object" }), "Check passing invalid object" );
-	
+
 	// test is() with comma-seperated expressions
 	ok( jQuery("#en").is("[lang=\"en\"],[lang=\"de\"]"), "Comma-seperated; Check for lang attribute: Expect en or de" );
 	ok( jQuery("#en").is("[lang=\"de\"],[lang=\"en\"]"), "Comma-seperated; Check for lang attribute: Expect en or de" );
@@ -88,7 +88,7 @@ test("is(jQuery)", function() {
 	ok( !jQuery("#radio1").is( jQuery("input:checked") ), "Check for pseudoclass: Expected not checked" );
 	ok( jQuery("#foo").is( jQuery("div:has(p)") ), "Check for child: Expected a child 'p' element" );
 	ok( !jQuery("#foo").is( jQuery("div:has(ul)") ), "Check for child: Did not expect 'ul' element" );
-	
+
 	// Some raw elements
 	ok( jQuery("#form").is( jQuery("form")[0] ), "Check for element: A form is a form" );
 	ok( !jQuery("#form").is( jQuery("div")[0] ), "Check for element: A form is not a div" );
@@ -102,7 +102,7 @@ test("index()", function() {
 	expect( 2 );
 
 	equal( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" );
-	
+
 	equal( jQuery("<div/>").index(), -1, "Node without parent returns -1" );
 });
 
@@ -142,7 +142,7 @@ test("filter(Selector|undefined)", function() {
 	same( jQuery("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
 	same( jQuery("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
 	same( jQuery("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
-	
+
 	same( jQuery("p").filter(null).get(),      [], "filter(null) should return an empty jQuery object");
 	same( jQuery("p").filter(undefined).get(), [], "filter(undefined) should return an empty jQuery object");
 	same( jQuery("p").filter(0).get(),         [], "filter(0) should return an empty jQuery object");
@@ -532,7 +532,7 @@ test("add(String|Element|Array|undefined)", function() {
 
 test("add(String, Context)", function() {
 	expect(6);
-	
+
 	deepEqual( jQuery( "#firstp" ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add selector to selector " );
 	deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add gEBId to selector" );
 	deepEqual( jQuery( document.getElementById("firstp") ).add( document.getElementById("ap") ).get(), q( "firstp", "ap" ), "Add gEBId to gEBId" );
-- 
2.39.5