X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2FselectorTest.js;h=2cd7db0b626a08f85de7ac3d4540ae11dad318bd;hb=c76f6cd12538301db8608ca088bf0c6816bd13e0;hp=23f44c30dc660269d72519356a2abace0fc98b3a;hpb=2fac5e7949ec342c450b2e032509eed0e35cf1ff;p=jquery.git

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 23f44c3..2cd7db0 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -1,7 +1,7 @@
 module("selector");
 
 test("element", function() {
-	expect(8);
+	expect(9);
 	ok( $("*").size() >= 30, "Select all" );
 	t( "Element Selector", "div", ["main","foo"] );
 	t( "Element Selector", "body", ["body"] );
@@ -11,6 +11,8 @@ test("element", function() {
 	
 	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' );
+
+	t( "Element Selector with underscore", "foo_bar", ["foobar"] );
 });
 
 test("broken", function() {
@@ -88,7 +90,7 @@ test("multiple", function() {
 });
 
 test("child and adjacent", function() {
-	expect(22);
+	expect(18);
 	t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
 	t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
@@ -105,15 +107,11 @@ test("child and adjacent", function() {
 	
 	t( "First Child", "p:first-child", ["firstp","sndp"] );
 	t( "Nth Child", "p:nth-child(1)", ["firstp","sndp"] );
-	t( "First Child, XPath", "p[1]", ["firstp","sndp"] );
 	
 	t( "Last Child", "p:last-child", ["sap"] );
-	t( "Last Child, XPath", "p[3]", ["sap"] );
 	
 	t( "Nth-child", "#main form > *:nth-child(2)", ["text2"] );
-	t( "Nth-child, XPath", "#main form > *[2]", ["text2"] );
 	t( "Nth-child", "#main form > :nth-child(2)", ["text2"] );
-	t( "Nth-child, XPath", "#main form > [2]", ["text2"] );
 });
 
 test("attributes", function() {
@@ -183,7 +181,7 @@ test("pseudo (:) selectors", function() {
 });
 
 test("basic xpath", function() {
-	expect(17);
+	expect(15);
 	ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
 	t( "All Div Elements", "//div", ["main","foo"] );
 	t( "Absolute Path", "/html/body", ["body"] );
@@ -194,14 +192,12 @@ test("basic xpath", function() {
 	t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] );
 	t( "Attribute Exists", "//a[@title]", ["google"] );
 	t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
-	t( "Attribute RegExp", "//a[@rel=~/BooKmaRk/i]", ["simon1"] );
-	t( "Attribute Inverse RegExp", "//a[@id!~/mon/]", ["google","groups","anchor1","mark","yahoo","anchor2"] );
 	t( "Parent Axis", "//p/..", ["main","foo"] );
-	t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );
-	t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );
+	t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","sndp","en","sap"] );
+	t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","table","sndp","en","sap"] );
 	t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
 	
 	$("#foo").each(function() {
 		isSet( $("/p", this).get(), q("sndp", "en", "sap"), "Check XPath context" );
 	});
-});
\ No newline at end of file
+});