X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=77ee0997944a8b986f1d9b21c0a829f904cfd3f9;hb=515efbdc7119aa79de710144effe18413d4cb14a;hp=54a89d92046569718f01c1c8b5ede63ad67f5a0b;hpb=626624a19a6cbd70b44da08ee2123ba79f8e2bb0;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index 54a89d9..77ee099 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -24,8 +24,26 @@ test("expando", function(){
 	equals( id.foo, "bar", "jQuery.data worked correctly" );
 });
 
+test("jQuery.acceptData", function() {
+	expect(7);
+
+	ok( jQuery.acceptData( document ), "document" );
+	ok( jQuery.acceptData( document.documentElement ), "documentElement" );
+	ok( jQuery.acceptData( {} ), "object" );
+	ok( !jQuery.acceptData( document.createElement("embed") ), "embed" );
+	ok( !jQuery.acceptData( document.createElement("applet") ), "applet" );
+
+	var flash = document.createElement("object");
+	flash.setAttribute("classid", "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000");
+	ok( jQuery.acceptData( flash ), "flash" );
+
+	var applet = document.createElement("object");
+	applet.setAttribute("classid", "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93");
+	ok( !jQuery.acceptData( applet ), "applet" );
+});
+
 test("jQuery.data", function() {
-	expect(12);
+	expect(13);
 	var div = document.createElement("div");
 
 	ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
@@ -47,9 +65,11 @@ test("jQuery.data", function() {
 	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 +81,14 @@ test("jQuery.data", function() {
 });
 
 test(".data()", function() {
-	expect(1);
+	expect(4);
 
 	var div = jQuery("#foo");
+	strictEqual( div.data("foo"), undefined, "Make sure that missing result is undefined" );
+
 	div.data("test", "success");
 	same( div.data(), {test: "success"}, "data() get the entire data object" );
+	strictEqual( div.data("foo"), undefined, "Make sure that missing result is still undefined" );
 
 	var nodiv = jQuery("#unfound");
 	equals( nodiv.data(), null, "data() on empty set returns null" );