X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fdata.js;h=1163ddc29c7a5d82a8f391a1b7a53f88fb507b5c;hb=6a1d4f1a80e09e3857f25bb6eb7b190a3a9a4de0;hp=03d38c9cf9dd2ace1790f0daea17689d5c8a64f6;hpb=9ad7c21e701f827e108de038ff704f1e9b7022da;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index 03d38c9..1163ddc 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -2,54 +2,56 @@ 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" );
 });
 
 test("jQuery.data", function() {
-	expect(12);
+	expect(13);
 	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");
 
+	jQuery.data(div, "test3", "orig");
 	jQuery.data(div, { "test": "in", "test2": "in2" });
 	equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." );
 	equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data." );
+	equals( jQuery.data(div, "test3"), "orig", "Verify original not overwritten." );
 
 	var obj = {};
 	jQuery.data( obj, "prop", true );
@@ -61,11 +63,14 @@ test("jQuery.data", function() {
 });
 
 test(".data()", function() {
-	expect(1);
+	expect(2);
 
 	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,14 +150,14 @@ 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();
 });