X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=28be6533624ae4dadda328aaa297da0bc1659690;hb=6504751006e6848369c9bfa5758f06b5ff40ba58;hp=fe2e992a8aa7591b397fe44091840ba76fb96ca0;hpb=8d52c27808a77f51d1cf42c7e738b0b356466c1a;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index fe2e992..28be653 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,7 +12,7 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(11);
+	expect(12);
 
 	// Basic constructor's behavior
 
@@ -21,6 +21,9 @@ test("jQuery()", function() {
 	equals( jQuery(null).length, 0, "jQuery(null) === jQuery([])" );
 	equals( jQuery("").length, 0, "jQuery('') === jQuery([])" );
 
+	var obj = jQuery("div")
+	equals( jQuery(obj).selector, "div", "jQuery(jQueryObj) == jQueryObj" );
+
 		// can actually yield more than one, when iframes are included, the window is an array as well
 	equals( 1, jQuery(window).length, "Correct number of elements generated for jQuery(window)" );
 
@@ -386,6 +389,12 @@ test("each(Function)", function() {
 	ok( pass, "Execute a function, Relative" );
 });
 
+test("index()", function() {
+	expect(1);
+
+	equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" )
+});
+
 test("index(Object|String|undefined)", function() {
 	expect(16);
 
@@ -435,7 +444,7 @@ test("jQuery.merge()", function() {
 });
 
 test("jQuery.extend(Object, Object)", function() {
-	expect(21);
+	expect(23);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -463,9 +472,19 @@ test("jQuery.extend(Object, Object)", function() {
 	var empty = {};
 	var optionsWithLength = { foo: { length: -1 } };
 	jQuery.extend(true, empty, optionsWithLength);
-
 	isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" );
 
+	empty = {};
+	var optionsWithDate = { foo: { date: new Date } };
+	jQuery.extend(true, empty, optionsWithDate);
+	isObj( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
+
+	var myKlass = function() {};
+	empty = {};
+	var optionsWithCustomObject = { foo: { date: new myKlass } };
+	jQuery.extend(true, empty, optionsWithCustomObject);
+	isObj( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" );
+
 	var nullUndef;
 	nullUndef = jQuery.extend({}, options, { xnumber2: null });
 	ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");
@@ -583,3 +602,13 @@ test("jQuery.makeArray", function(){
 
 	ok( jQuery.makeArray(document.getElementById('form')).length >= 13, "Pass makeArray a form (treat as elements)" );
 });
+
+test("jQuery.isEmptyObject", function(){
+	expect(2);
+	
+	equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
+	equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );
+	
+	// What about this ?
+	// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
+});
\ No newline at end of file