X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=ade34152757f8a362c75a76f0738451f4c9f2369;hb=c41fab1eb099cd284b65c0d37431adfb38f4106a;hp=63f2b6c854189448dd477287495ea0869af6ef4b;hpb=2764127335126601b90aac6488ef927dce1eceda;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 63f2b6c..ade3415 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,8 +12,19 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(8);
+	expect(11);
 
+	// Basic constructor's behavior
+	
+	equals( jQuery().length, 1, "jQuery() === jQuery(document)" );
+	equals( jQuery(undefined).length, 0, "jQuery(undefined) === jQuery([])" );
+	equals( jQuery(null).length, 0, "jQuery(null) === jQuery([])" );
+	equals( jQuery("").length, 0, "jQuery('') === jQuery([])" );
+		
+		// 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)" );
+	
+	
 	var main = jQuery("#main");
 	isSet( jQuery("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
 
@@ -42,11 +53,6 @@ test("jQuery()", function() {
 	var div = jQuery("<div/><hr/><code/><b/>");
 	equals( div.length, 4, "Correct number of elements generated for div hr code b" );
 
-	// can actually yield more than one, when iframes are included, the window is an array as well
-	equals( jQuery(window).length, 1, "Correct number of elements generated for window" );
-
-	equals( jQuery(document).length, 1, "Correct number of elements generated for document" );
-
 	equals( jQuery([1,2,3]).get(1), 2, "Test passing an array to the factory" );
 
 	equals( jQuery(document.body).get(0), jQuery('body').get(0), "Test passing an html node to the factory" );
@@ -56,19 +62,19 @@ test("selector state", function() {
 	expect(30);
 
 	var test;
-	
-	test = jQuery();
+
+	test = jQuery(undefined);
 	equals( test.selector, "", "Empty jQuery Selector" );
 	equals( test.context, undefined, "Empty jQuery Context" );
-	
+
 	test = jQuery(document);
 	equals( test.selector, "", "Document Selector" );
 	equals( test.context, document, "Document Context" );
-	
+
 	test = jQuery(document.body);
 	equals( test.selector, "", "Body Selector" );
 	equals( test.context, document.body, "Body Context" );
-	
+
 	test = jQuery("#main");
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document, "#main Context" );
@@ -76,11 +82,11 @@ test("selector state", function() {
 	test = jQuery("#notfoundnono");
 	equals( test.selector, "#notfoundnono", "#notfoundnono Selector" );
 	equals( test.context, document, "#notfoundnono Context" );
-	
+
 	test = jQuery("#main", document);
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document, "#main Context" );
-	
+
 	test = jQuery("#main", document.body);
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document.body, "#main Context" );
@@ -89,7 +95,7 @@ test("selector state", function() {
 	test = jQuery(test);
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document.body, "#main Context" );
-	
+
 	test = jQuery(document.body).find("#main");
 	equals( test.selector, "#main", "#main find Selector" );
 	equals( test.context, document.body, "#main find Context" );
@@ -97,23 +103,23 @@ test("selector state", function() {
 	test = jQuery("#main").filter("div");
 	equals( test.selector, "#main.filter(div)", "#main filter Selector" );
 	equals( test.context, document, "#main filter Context" );
-	
+
 	test = jQuery("#main").not("div");
 	equals( test.selector, "#main.not(div)", "#main not Selector" );
 	equals( test.context, document, "#main not Context" );
-	
+
 	test = jQuery("#main").filter("div").not("div");
 	equals( test.selector, "#main.filter(div).not(div)", "#main filter, not Selector" );
 	equals( test.context, document, "#main filter, not Context" );
-	
+
 	test = jQuery("#main").filter("div").not("div").end();
 	equals( test.selector, "#main.filter(div)", "#main filter, not, end Selector" );
 	equals( test.context, document, "#main filter, not, end Context" );
-	
+
 	test = jQuery("#main").parent("body");
 	equals( test.selector, "#main.parent(body)", "#main parent Selector" );
 	equals( test.context, document, "#main parent Context" );
-	
+
 	test = jQuery("#main").eq(0);
 	equals( test.selector, "#main.slice(0,1)", "#main eq Selector" );
 	equals( test.context, document, "#main eq Context" );
@@ -366,12 +372,13 @@ test("each(Function)", function() {
 	ok( pass, "Execute a function, Relative" );
 });
 
-test("index(Object)", function() {
-	expect(10);
+test("index(Object|String|undefined)", function() {
+	expect(16);
 
 	var elements = jQuery([window, document]),
 		inputElements = jQuery('#radio1,#radio2,#check1,#check2');
 
+	// Passing a node
 	equals( elements.index(window), 0, "Check for index of elements" );
 	equals( elements.index(document), 1, "Check for index of elements" );
 	equals( inputElements.index(document.getElementById('radio1')), 0, "Check for index of elements" );
@@ -381,24 +388,34 @@ test("index(Object)", function() {
 	equals( inputElements.index(window), -1, "Check for not found index" );
 	equals( inputElements.index(document), -1, "Check for not found index" );
 
+	// Passing a jQuery object
 	// enabled since [5500]
 	equals( elements.index( elements ), 0, "Pass in a jQuery object" );
 	equals( elements.index( elements.eq(1) ), 1, "Pass in a jQuery object" );
+	equals( jQuery("#form :radio").index( jQuery("#radio2") ), 1, "Pass in a jQuery object" );
+
+	// Passing a selector or nothing
+	// enabled since [6330]
+	equals( jQuery('#text2').index(), 2, "Check for index amongst siblings" );
+	equals( jQuery('#form').children().eq(4).index(), 4, "Check for index amongst siblings" );
+	equals( jQuery('#radio2').index('#form :radio') , 1, "Check for index within a selector" );
+	equals( jQuery('#form :radio').index( jQuery('#radio2') ), 1, "Check for index within a selector" );
+	equals( jQuery('#radio2').index('#form :text') , -1, "Check for index not found within a selector" );
 });
 
 test("jQuery.merge()", function() {
 	expect(6);
-		
+
 	var parse = jQuery.merge;
-	
+
 	same( parse([],[]), [], "Empty arrays" );
-	
+
 	same( parse([1],[2]), [1,2], "Basic" );
 	same( parse([1,2],[3,4]), [1,2,3,4], "Basic" );
-	
+
 	same( parse([1,2],[]), [1,2], "Second empty" );
-	same( parse([],[1,2]), [1,2], "First empty" );	
-	
+	same( parse([],[1,2]), [1,2], "First empty" );
+
 	// Fixed at [5998], #3641
 	same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
 });
@@ -531,7 +548,7 @@ test("jQuery.makeArray", function(){
 
 	// function, is tricky as it has length
 	equals( jQuery.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );
-	
+
 	//window, also has length
 	equals( jQuery.makeArray(window)[0], window, "Pass makeArray the window" );