X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=1f0850c02468485b8bd770ab53696b023c308613;hb=a09dac440609ac0154b489a647cfe3b93b7d400b;hp=679d50425e4506426b49018c2706e9700cb79459;hpb=4b25b147ab60a026ba1841b313d713fe57530b04;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 679d504..1f0850c 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -451,7 +451,7 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(17);
+	expect(19);
 	var div = jQuery("div").attr("foo", "bar");
 		fail = false;
 	for ( var i = 0; i < div.size(); i++ ) {
@@ -515,6 +515,16 @@ test("attr(String, Object)", function() {
 	}
 	ok( thrown, "Exception thrown when trying to change type property" );
 	equals( "checkbox", jQuery(check).attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
+	
+	var check = jQuery("<input />");
+	var thrown = true;
+	try {
+		check.attr('type','checkbox');
+	} catch(e) {
+		thrown = false;
+	}
+	ok( thrown, "Exception thrown when trying to change type property" );
+	equals( "checkbox", check.attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
 });
 
 if ( !isLocal ) {
@@ -1139,6 +1149,8 @@ test("is(String)", function() {
 });
 
 test("jQuery.merge()", function() {
+	expect(6);
+		
 	var parse = jQuery.merge;
 	
 	same( parse([],[]), [], "Empty arrays" );
@@ -1481,13 +1493,20 @@ test("removeClass(String) - simple", function() {
 });
 
 test("toggleClass(String)", function() {
-	expect(3);
+	expect(6);
 	var e = jQuery("#firstp");
 	ok( !e.is(".test"), "Assert class not present" );
 	e.toggleClass("test");
 	ok( e.is(".test"), "Assert class present" );
 	e.toggleClass("test");
 	ok( !e.is(".test"), "Assert class not present" );
+
+	e.toggleClass("test", false);
+	ok( !e.is(".test"), "Assert class not present" );
+	e.toggleClass("test", true);
+	ok( e.is(".test"), "Assert class present" );
+	e.toggleClass("test", false);
+	ok( !e.is(".test"), "Assert class not present" );
 });
 
 test("removeAttr(String", function() {
@@ -1559,100 +1578,6 @@ test("jQuery.className", function() {
 	ok( c.has(x, "bar"), "Check has2" );
 });
 
-test("jQuery.data", function() {
-	expect(5);
-	var div = jQuery("#foo")[0];
-	equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
-	jQuery.data(div, "test", "success");
-	equals( jQuery.data(div, "test"), "success", "Check for added data" );
-	jQuery.data(div, "test", "overwritten");
-	equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" );
-	jQuery.data(div, "test", undefined);
-	equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed");
-	jQuery.data(div, "test", null);
-	ok( jQuery.data(div, "test") === null, "Check for null data");
-});
-
-test(".data()", function() {
-	expect(18);
-	var div = jQuery("#foo");
-	equals( div.data("test"), undefined, "Check for no data exists" );
-	div.data("test", "success");
-	equals( div.data("test"), "success", "Check for added data" );
-	div.data("test", "overwritten");
-	equals( div.data("test"), "overwritten", "Check for overwritten data" );
-	div.data("test", undefined);
-	equals( div.data("test"), "overwritten", "Check that data wasn't removed");
-	div.data("test", null);
-	ok( div.data("test") === null, "Check for null data");
-
-	div.data("test", "overwritten");
-	var hits = {test:0}, gets = {test:0};
-
-	div
-		.bind("setData",function(e,key,value){ hits[key] += value; })
-		.bind("setData.foo",function(e,key,value){ hits[key] += value; })
-		.bind("getData",function(e,key){ gets[key] += 1; })
-		.bind("getData.foo",function(e,key){ gets[key] += 3; });
-
-	div.data("test.foo", 2);
-	equals( div.data("test"), "overwritten", "Check for original data" );
-	equals( div.data("test.foo"), 2, "Check for namespaced data" );
-	equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" );
-	equals( hits.test, 2, "Check triggered setter functions" );
-	equals( gets.test, 5, "Check triggered getter functions" );
-
-	hits.test = 0;
-	gets.test = 0;
-
-	div.data("test", 1);
-	equals( div.data("test"), 1, "Check for original data" );
-	equals( div.data("test.foo"), 2, "Check for namespaced data" );
-	equals( div.data("test.bar"), 1, "Check for unmatched namespace" );
-	equals( hits.test, 1, "Check triggered setter functions" );
-	equals( gets.test, 5, "Check triggered getter functions" );
-
-	hits.test = 0;
-	gets.test = 0;
-
-	div
-		.bind("getData",function(e,key){ return key + "root"; })
-		.bind("getData.foo",function(e,key){ return key + "foo"; });
-
-	equals( div.data("test"), "testroot", "Check for original data" );
-	equals( div.data("test.foo"), "testfoo", "Check for namespaced data" );
-	equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" );
-});
-
-test("jQuery.removeData", function() {
-	expect(1);
-	var div = jQuery("#foo")[0];
-	jQuery.data(div, "test", "testing");
-	jQuery.removeData(div, "test");
-	equals( jQuery.data(div, "test"), undefined, "Check removal of data" );
-});
-
-test(".removeData()", function() {
-	expect(6);
-	var div = jQuery("#foo");
-	div.data("test", "testing");
-	div.removeData("test");
-	equals( div.data("test"), undefined, "Check removal of data" );
-
-	div.data("test", "testing");
-	div.data("test.foo", "testing2");
-	div.removeData("test.bar");
-	equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
-	equals( div.data("test"), "testing", "Make sure data is intact" );
-
-	div.removeData("test");
-	equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
-	equals( div.data("test"), undefined, "Make sure data is intact" );
-
-	div.removeData("test.foo");
-	equals( div.data("test.foo"), undefined, "Make sure data is intact" );
-});
-
 test("remove()", function() {
 	expect(6);
 	jQuery("#ap").children().remove();