X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=0d75bc4440b6604aaf0fa159857446e835577709;hb=9e06903a99caf5619d0db858ed3d24f0e6ee15db;hp=d18377d5933fafaf0ef4d3efdc5a943a395feff6;hpb=bbd933cbfe6d31a749cb336d7a84155ccfab247f;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index d18377d..0d75bc4 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -1,20 +1,19 @@
 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" );
 	
@@ -25,12 +24,15 @@ test("expando", function(){
 });
 
 test("jQuery.data", function() {
-	expect(6);
-	var div = jQuery("#foo")[0];
-	equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
+	expect(9);
+	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,10 @@ 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." );
 });
 
 test(".data()", function() {
@@ -54,18 +60,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 +127,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];
@@ -142,170 +165,3 @@ test(".removeData()", function() {
 	div.removeData("test.foo");
 	equals( div.data("test.foo"), undefined, "Make sure data is intact" );
 });
-
-test("queue() defaults to 'fx' type", function () {
-	expect(1);
-	stop();
-
-	var counter = 0;
-
-	var $foo = jQuery("#foo");
-
-	$foo.queue(function() {
-		var self = this;
-		setTimeout(function() {
-			jQuery(self).dequeue("fx");
-			start();
-		}, 200);
-	}).queue(function() {
-		ok( "dequeuing 'fx' calls queues created with no name" )
-	});
-
-});
-
-test("queue() with other types",function() {
-	expect(9);
-	var counter = 0;
-	
-	var $div = jQuery({});
-	
-	$div
-		.queue('foo',function(){
-			equals( ++counter, 1, "Dequeuing" );
-			jQuery.dequeue(this,'foo');
-		})
-		.queue('foo',function(){
-			equals( ++counter, 2, "Dequeuing" );
-			jQuery(this).dequeue('foo');
-		})
-		.queue('foo',function(){
-			equals( ++counter, 3, "Dequeuing" );
-		})
-		.queue('foo',function(){
-			equals( ++counter, 4, "Dequeuing" );
-		});
-		
-	equals( $div.queue('foo').length, 4, "Testing queue length" );
-	
-	$div.dequeue('foo');
-	
-	equals( counter, 3, "Testing previous call to dequeue" );
-	equals( $div.queue('foo').length, 1, "Testing queue length" );
-	
-	$div.dequeue('foo');
-	
-	equals( counter, 4, "Testing previous call to dequeue" );
-	equals( $div.queue('foo').length, 0, "Testing queue length" );
-});
-
-test("queue(name) passes in the next item in the queue as a parameter", function() {
-	expect(2);
-	
-	var div = jQuery({});
-	var counter = 0;
-	
-	div.queue("foo", function(next) {
-		equals(++counter, 1, "Dequeueing");
-		next();
-	}).queue("foo", function(next) {
-		equals(++counter, 2, "Next was called");
-		next();
-	}).queue("bar", function() {
-		equals(++counter, 3, "Other queues are not triggered by next()")
-	});
-	
-	div.dequeue("foo");
-});
-
-test("queue(name) passes in the next item in the queue as a parameter", function() {
-	expect(2);
-	
-	var div = jQuery({});
-	var counter = 0;
-	
-	div.queue("foo", function(next) {
-		equals(++counter, 1, "Dequeueing");
-		next();
-	}).queue("foo", function(next) {
-		equals(++counter, 2, "Next was called");
-		next();
-	}).queue("bar", function() {
-		equals(++counter, 3, "Other queues are not triggered by next()")
-	});
-	
-	div.dequeue("foo");
-});
-
-test("queue() passes in the next item in the queue as a parameter to fx queues", function() {
-	expect(2);
-	stop();
-	
-	var div = jQuery({});
-	var counter = 0;
-	
-	div.queue(function(next) {
-		equals(++counter, 1, "Dequeueing");
-		var self = this;
-		setTimeout(function() { next() }, 500);
-	}).queue(function(next) {
-		equals(++counter, 2, "Next was called");
-		next();
-		start();
-	}).queue("bar", function() {
-		equals(++counter, 3, "Other queues are not triggered by next()")
-	});
-
-});
-
-test("delay()", function() {
-	expect(2);
-	stop();
-
-	var foo = jQuery({}), run = 0;
-
-	foo.delay(100).queue(function(){
-		run = 1;
-		ok( true, "The function was dequeued." );
-		start();
-	});
-
-	equals( run, 0, "The delay delayed the next function from running." );
-});
-
-test("clearQueue(name) clears the queue", function() {
-	expect(1);
-	
-	var div = jQuery({});
-	var counter = 0;
-	
-	div.queue("foo", function(next) {
-		counter++;
-		jQuery(this).clearQueue("foo");
-		next();
-	}).queue("foo", function(next) {
-		counter++;
-	});
-	
-	div.dequeue("foo");
-	
-	equals(counter, 1, "the queue was cleared");
-});
-
-test("clearQueue() clears the fx queue", function() {
-	expect(1);
-	
-	var div = jQuery({});
-	var counter = 0;
-	
-	div.queue(function(next) {
-		counter++;
-		var self = this;
-		setTimeout(function() { jQuery(self).clearQueue(); next(); }, 50);
-	}).queue(function(next) {
-		counter++;
-	});
-	
-	equals(counter, 1, "the queue was cleared");
-	
-	div.removeData();
-});