X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=d5eb73b080ce31aa6c18e1faaeb009fadd3d4f7d;hb=2e10af143b7eafb7142524f6534a62aee1910bd1;hp=3916534c19a237e6b2f7b2f64d40a9b64b19824f;hpb=ebad701751689b773afe29d1e3c4532c7810d02a;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index 3916534..d5eb73b 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -1,36 +1,38 @@
 module("data");
 
 test("expando", function(){
-	expect(7);
+	expect(6);
 	
 	equals("expando" in jQuery, true, "jQuery is exposing the expando");
 	
 	var obj = {};
 	jQuery.data(obj);
-	equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
-	
-	jQuery.data(obj, true);
-	equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
-	
+	equals( jQuery.expando in obj, true, "jQuery.data adds an expando to the object" );
+
+	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, true, "jQuery.data added an entry to jQuery.cache" );
+	equals( id in jQuery.cache, false, "jQuery.data did not add an entry to jQuery.cache" );
 	
-	equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" );
+	equals( id.foo, "bar", "jQuery.data worked correctly" );
 });
 
 test("jQuery.data", function() {
-	expect(6);
-	var div = jQuery("#foo")[0];
-	equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
+	expect(12);
+	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" );
@@ -43,6 +45,18 @@ test("jQuery.data", function() {
 	
 	jQuery.data(div, "test", null);
 	ok( jQuery.data(div, "test") === null, "Check for null data");
+
+	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." );
+
+	var obj = {};
+	jQuery.data( obj, "prop", true );
+
+	ok( obj[ jQuery.expando ], "Data is being stored on the object." );
+	ok( obj[ jQuery.expando ].prop, "Data is being stored on the object." );
+
+	equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved." );
 });
 
 test(".data()", function() {
@@ -54,24 +68,43 @@ test(".data()", function() {
 })
 
 test(".data(String) and .data(String, Object)", function() {
-	expect(22);
-	var div = jQuery("#foo");
-	equals( div.data("test"), undefined, "Check for no data exists" );
+	expect(27);
+	var div = jQuery("<div/>");
+
+	ok( 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");
 
+	ok( div.data("notexist") === undefined, "Check for no data exists" );
+
 	div.data("test", "overwritten");
-	var hits = {test:0}, gets = {test:0};
+	var hits = {test:0}, gets = {test:0}, changes = {test:0, value:null};
+
+
+	function logChangeData(e,key,value) {
+		var dataKey = key;
+		if ( e.namespace ) {
+			dataKey = dataKey + "." + e.namespace;
+		}
+		changes[key] += value;
+		changes.value = jQuery.data(e.target, dataKey);
+	}
 
 	div
 		.bind("setData",function(e,key,value){ hits[key] += value; })
 		.bind("setData.foo",function(e,key,value){ hits[key] += value; })
+		.bind("changeData",logChangeData)
+		.bind("changeData.foo",logChangeData)
 		.bind("getData",function(e,key){ gets[key] += 1; })
 		.bind("getData.foo",function(e,key){ gets[key] += 3; });
 
@@ -81,9 +114,13 @@ test(".data(String) and .data(String, Object)", function() {
 	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" );
+	equals( changes.test, 2, "Check sets raise changeData");
+	equals( changes.value, 2, "Check changeData after data has been set" );
 
 	hits.test = 0;
 	gets.test = 0;
+	changes.test = 0;
+	changes.value = null;
 
 	div.data("test", 1);
 	equals( div.data("test"), 1, "Check for original data" );
@@ -91,9 +128,8 @@ test(".data(String) and .data(String, Object)", function() {
 	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;
+	equals( changes.test, 1, "Check sets raise changeData" );
+	equals( changes.value, 1, "Check changeData after data has been set" );
 
 	div
 		.bind("getData",function(e,key){ return key + "root"; })
@@ -114,6 +150,16 @@ test(".data(String) and .data(String, Object)", function() {
 	$elem.removeData();
 });
 
+test(".data(Object)", function() {
+	expect(2);
+
+	var div = jQuery("<div/>");
+
+	div.data({ "test": "in", "test2": "in2" });
+	equals( div.data("test"), "in", "Verify setting an object in data." );
+	equals( div.data("test2"), "in2", "Verify setting an object in data." );
+});
+
 test("jQuery.removeData", function() {
 	expect(1);
 	var div = jQuery("#foo")[0];