X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fselector.js;h=07c4434d093717c6abc1f1373bd86b5eaab9b69d;hb=5311565223cca0158cb44f4fffa812ce8dd4a4c8;hp=3c0c6761da801d014e2f9d2df54736ffdd3271a2;hpb=e2ef3df86d5f54274bf2b779d882c30aa0886bfe;p=jquery.git

diff --git a/test/unit/selector.js b/test/unit/selector.js
index 3c0c676..07c4434 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -12,7 +12,7 @@ test("element", function() {
 	t( "Element Selector", "body", ["body"] );
 	t( "Element Selector", "html", ["html"] );
 	t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
-	ok( $("param", "#object1").length == 2, "Object/param as context" );
+	equals( $("param", "#object1").length, 2, "Object/param as context" );
 	
 	ok( $("#length").length, '<input name="length"> cannot be found under IE, see #945' );
 	ok( $("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' );
@@ -23,7 +23,7 @@ if ( location.protocol != "file:" ) {
 		expect(1);
 		stop();
 		$.get("data/with_fries.xml", function(xml) {
-			ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+			equals( $("foo_bar", xml).length, 1, "Element Selector with underscore" );
 			start();
 		});
 	});
@@ -67,8 +67,8 @@ test("id", function() {
 	t( "All Children of ID with no children", "#firstUL/*", [] );
 	
 	$('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
-	ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );
-	ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );
+	equals( $("#tName1")[0].id, 'tName1', "ID selector with same value for a name attribute" );
+	equals( $("#tName2").length, 0, "ID selector non-existing but name attribute on an A tag" );
 	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
 	
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
@@ -182,7 +182,7 @@ test("attributes", function() {
 });
 
 test("pseudo (:) selectors", function() {
-	expect(32);
+	expect(35);
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
@@ -195,6 +195,9 @@ test("pseudo (:) selectors", function() {
 	t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
 	t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] );
 	t( "Not", "a.blog:not(.link)", ["mark"] );
+	t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] );
+	t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] );
+	t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
 	
 	t( "nth Element", "p:nth(1)", ["ap"] );
 	t( "First Element", "p:first", ["firstp"] );