Attach data directly to plain objects, no reason to use the central jQuery.cache...

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

diff --git a/test/unit/data.js b/test/unit/data.js
index 3916534..11bce4d 100644 (file)
--- 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,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};
 
@@ -114,6 +135,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];