X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=54a89d92046569718f01c1c8b5ede63ad67f5a0b;hb=626624a19a6cbd70b44da08ee2123ba79f8e2bb0;hp=058f23f4041729c502bfadc8fca637118b6f258f;hpb=e0b24306a86629f02576017f25d295fbe07f21a5;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index 058f23f..54a89d9 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -2,25 +2,25 @@ module("data");
 
 test("expando", function(){
 	expect(7);
-	
+
 	equals("expando" in jQuery, true, "jQuery is exposing the expando");
-	
+
 	var obj = {};
 	jQuery.data(obj);
 	equals( jQuery.expando in obj, true, "jQuery.data adds an expando to the object" );
 	equals( typeof obj[jQuery.expando], "function", "jQuery.data adds an expando to the object as a function" );
 
-	obj = {};	
+	obj = {};
 	jQuery.data(obj, 'test');
 	equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
 
 	obj = {};
 	jQuery.data(obj, "foo", "bar");
 	equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
-	
+
 	var id = obj[jQuery.expando]();
 	equals( id in jQuery.cache, false, "jQuery.data did not add an entry to jQuery.cache" );
-	
+
 	equals( id.foo, "bar", "jQuery.data worked correctly" );
 });
 
@@ -29,21 +29,21 @@ test("jQuery.data", function() {
 	var div = document.createElement("div");
 
 	ok( 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" );
 
 	ok( jQuery.data(div, "notexist") === undefined, "Check for no data exists" );
-	
+
 	var data = jQuery.data(div);
 	same( data, { "test": "success" }, "Return complete data set" );
-	
+
 	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");
 
@@ -65,7 +65,10 @@ test(".data()", function() {
 
 	var div = jQuery("#foo");
 	div.data("test", "success");
-	same( div.data(), {test: "success"}, "data() get the entire data object" )
+	same( div.data(), {test: "success"}, "data() get the entire data object" );
+
+	var nodiv = jQuery("#unfound");
+	equals( nodiv.data(), null, "data() on empty set returns null" );
 })
 
 test(".data(String) and .data(String, Object)", function() {
@@ -145,20 +148,20 @@ test(".data(String) and .data(String, Object)", function() {
 	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" );
-	
+
 	// #3748
 	var $elem = jQuery({});
 	equals( $elem.data('nothing'), undefined, "Non-existent data returns undefined");
 	equals( $elem.data('null',null).data('null'), null, "null's are preserved");
 	equals( $elem.data('emptyString','').data('emptyString'), '', "Empty strings are preserved");
 	equals( $elem.data('false',false).data('false'), false, "false's are preserved");
-	
+
 	// Clean up
 	$elem.removeData();
 });
 
 test("data-* attributes", function() {
-	expect(25);
+	expect(27);
 	var div = jQuery("<div>"),
 		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");
 		
@@ -189,6 +192,8 @@ test("data-* attributes", function() {
 		.attr("data-pointbad2", "-.")
 		.attr("data-badjson", "{123}")
 		.attr("data-badjson2", "[abc]")
+		.attr("data-empty", "")
+		.attr("data-space", " ")
 		.attr("data-null", "null")
 		.attr("data-string", "test");
 	
@@ -201,6 +206,8 @@ test("data-* attributes", function() {
 	strictEqual( child.data('pointbad2'), "-.", "Bad number read from attribute");
 	strictEqual( child.data('badjson'), "{123}", "Bad number read from attribute");
 	strictEqual( child.data('badjson2'), "[abc]", "Bad number read from attribute");
+	strictEqual( child.data('empty'), "", "Empty string read from attribute");
+	strictEqual( child.data('space'), " ", "Empty string read from attribute");
 	strictEqual( child.data('null'), null, "Primitive null read from attribute");
 	strictEqual( child.data('string'), "test", "Typical string read from attribute");