Rewrote the live/delegate submit tests to be more generic.

[jquery.git] / test / unit / data.js

diff --git a/test/unit/data.js b/test/unit/data.js
index 79b23c6..11bce4d 100644 (file)
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -18,18 +18,21 @@ test("expando", function(){
        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(8);
-       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" );
@@ -46,6 +49,14 @@ test("jQuery.data", function() {
        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() {
@@ -57,18 +68,25 @@ 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(23);
+       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};