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

diff --git a/test/unit/core.js b/test/unit/core.js
index fe2e992..46858ce 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)" );
 
@@ -266,8 +269,41 @@ test("isFunction", function() {
 	});
 });
 
+test("isXMLDoc - HTML", function() {
+	expect(4);
+
+	ok( !jQuery.isXMLDoc( document ), "HTML document" );
+	ok( !jQuery.isXMLDoc( document.documentElement ), "HTML documentElement" );
+	ok( !jQuery.isXMLDoc( document.body ), "HTML Body Element" );
+
+	var iframe = document.createElement("iframe");
+	document.body.appendChild( iframe );
+
+	try {
+		var body = jQuery(iframe).contents()[0];
+		ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
+	} catch(e){
+		ok( false, "Iframe body element exception" );
+	}
+
+	document.body.removeChild( iframe );
+});
+
+if ( !isLocal ) {
+test("isXMLDoc - XML", function() {
+	expect(3);
+	stop();
+	jQuery.get('data/dashboard.xml', function(xml) {
+		ok( jQuery.isXMLDoc( xml ), "XML document" );
+		ok( jQuery.isXMLDoc( xml.documentElement ), "XML documentElement" );
+		ok( jQuery.isXMLDoc( jQuery("tab", xml)[0] ), "XML Tab Element" );
+		start();
+	});
+});
+}
+
 test("jQuery('html')", function() {
-	expect(8);
+	expect(13);
 
 	reset();
 	jQuery.foo = false;
@@ -277,6 +313,14 @@ test("jQuery('html')", function() {
 	jQuery("body").append("<script>jQuery.foo='test';</script>");
 	ok( jQuery.foo, "Executing a scripts contents in the right context" );
 
+	// Test multi-line HTML
+	var div = jQuery("<div>\r\nsome text\n<p>some p</p>\nmore text\r\n</div>")[0];
+	equals( div.nodeName.toUpperCase(), "DIV", "Make sure we're getting a div." );
+	equals( div.firstChild.nodeType, 3, "Text node." );
+	equals( div.lastChild.nodeType, 3, "Text node." );
+	equals( div.childNodes[1].nodeType, 1, "Paragraph." );
+	equals( div.childNodes[1].firstChild.nodeType, 3, "Paragraph text." );
+
 	reset();
 	ok( jQuery("<link rel='stylesheet'/>")[0], "Creating a link" );
 
@@ -386,6 +430,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 +485,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 +513,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 +643,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" );
+});