X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=7ec825832106cedb2cc631c30a8a15e7feaa78a5;hb=35c68b4578f804bcd10fe7ee1628cbbd263c32ff;hp=5890d191a3a7a62ac22bf008bf844681ca1e19da;hpb=ab756ceab04d13706593ddcd0fda1ac8360ff773;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 5890d19..7ec8258 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1025,7 +1025,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(17);
+	expect(20);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -1049,7 +1049,17 @@ test("$.extend(Object, Object)", function() {
 	isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
 	isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
 	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
-
+	
+	var nullUndef;
+	nullUndef = jQuery.extend({}, options, { xnumber2: null });
+	ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");
+	
+	nullUndef = jQuery.extend({}, options, { xnumber2: undefined });
+	ok( nullUndef.xnumber2 === options.xnumber2, "Check to make sure undefined values are not copied");
+	
+	nullUndef = jQuery.extend({}, options, { xnumber0: null });
+	ok( nullUndef.xnumber0 === null, "Check to make sure null values are inserted");
+	
 	var target = {};
 	var recursive = { foo:target, bar:5 };
 	jQuery.extend(true, target, recursive);
@@ -1511,7 +1521,7 @@ test("slice()", function() {
 });
 
 test("map()", function() {
-	expect(6);
+	expect(2);//expect(6);
 
 	isSet(
 		$("#ap").map(function(){
@@ -1529,6 +1539,8 @@ test("map()", function() {
 		"Single Map"
 	);
 	
+	return;//these haven't been accepted yet
+	
 	//for #2616
 	var keys = $.map( {a:1,b:2}, function( v, k ){
 		return k;
@@ -1589,7 +1601,9 @@ test("contents()", function() {
 });
 
 test("$.makeArray", function(){
-	expect(13);
+	expect(14);
+	
+	equals( $.makeArray($('html>*'))[0].nodeName, "HEAD", "Pass makeArray a jQuery object" );
 	
 	equals( $.makeArray(document.getElementsByName("PWD")).slice(0,1)[0].name, "PWD", "Pass makeArray a nodelist" );