Fixed :first (and now it uses :eq)

acdcjunior · acdcjunior · commit 67408e2a1d33 · 2015-03-25T19:28:33.000-03:00
diff --git a/src/main/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/basicfilter/SQCssFirstPseudoClass.java b/src/main/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/basicfilter/SQCssFirstPseudoClass.java
@@ -16,30 +16,26 @@
 
 package io.github.seleniumquery.by.csstree.condition.pseudoclass.basicfilter;
 
-import io.github.seleniumquery.by.csstree.condition.pseudoclass.SQCssPseudoClassCondition;
-import io.github.seleniumquery.by.csstree.condition.pseudoclass.SQCssPseudoNeverNativelySupported;
-import io.github.seleniumquery.by.locator.SQLocatorXPath;
+import io.github.seleniumquery.by.css.pseudoclasses.PseudoClassSelector;
 
 /**
  * :first
+ * https://api.jquery.com/first-selector/
  *
  * @author acdcjunior
  * @since 0.10.0
  */
-public class SQCssFirstPseudoClass extends SQCssPseudoClassCondition {
+public class SQCssFirstPseudoClass extends SQCssEqPseudoClass {
 
     public static final String PSEUDO = "first";
 
-    public SQCssPseudoNeverNativelySupported firstPseudoClassLocatorGenerationStrategy = new SQCssPseudoNeverNativelySupported() {
-        @Override
-        public SQLocatorXPath toXPath() {
-            return SQLocatorXPath.pureXPath("position() = 1");
-        }
-    };
+    public SQCssFirstPseudoClass(PseudoClassSelector pseudoClassSelector) {
+        super(pseudoClassSelector);
+    }
 
     @Override
-    public SQCssPseudoNeverNativelySupported getSQCssLocatorGenerationStrategy() {
-        return firstPseudoClassLocatorGenerationStrategy;
+    public String getArgument() {
+        return "0";
     }
 
 }
diff --git a/src/test/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/PseudoClassTestUtils.java b/src/test/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/PseudoClassTestUtils.java
@@ -18,7 +18,6 @@
 
 import io.github.seleniumquery.by.css.pseudoclasses.PseudoClassSelector;
 import io.github.seleniumquery.by.csstree.condition.SQCssCondition;
-import io.github.seleniumquery.by.csstree.condition.SQCssConditionImplementedLocators;
 import io.github.seleniumquery.by.filter.ElementFilter;
 import io.github.seleniumquery.by.locator.SQLocator;
 import io.github.seleniumquery.by.locator.SQLocatorUtilsTest;
@@ -36,6 +35,13 @@
 
 public class PseudoClassTestUtils {
 
+    public static final PseudoClassSelector EMPTY = new PseudoClassSelector(null, null, "") {
+        @Override
+        public String getPseudoClassContent() {
+            return "";
+        }
+    };
+
     public static <T extends SQCssCondition> void assertPseudo(String selector, Class<T> pseudoClassClass) {
         // given
         // selector
@@ -88,7 +94,7 @@ private static <T extends SQCssFunctionalPseudoClassCondition> void assertSelect
     public static void assertFilterOnlyPseudoGeneratesFilter(SQCssPseudoClassCondition pseudoClassCondition, ElementFilter pseudoClassFilter) {
         SQLocator previous = SQLocatorUtilsTest.universalSelectorLocator(SQLocatorUtilsTest.createMockDriverWithoutNativeSupportFor(getSelectorForPseudoClass(pseudoClassCondition)));
         // when
-        SQLocator locator = ((SQCssConditionImplementedLocators) pseudoClassCondition).toSQLocator(previous);
+        SQLocator locator = pseudoClassCondition.toSQLocator(previous);
         // then
         assertThat(locator.getSqLocatorCss().toString(), is(previous.getSqLocatorCss().toString()));
         assertThat(locator.canFetchThroughCssAlone(), is(false));
diff --git a/src/test/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/basicfilter/SQCssFirstPseudoClassTest.java b/src/test/java/io/github/seleniumquery/by/csstree/condition/pseudoclass/basicfilter/SQCssFirstPseudoClassTest.java
@@ -16,6 +16,7 @@
 
 package io.github.seleniumquery.by.csstree.condition.pseudoclass.basicfilter;
 
+import io.github.seleniumquery.by.csstree.condition.pseudoclass.PseudoClassTestUtils;
 import org.junit.Test;
 
 import static io.github.seleniumquery.by.csstree.condition.pseudoclass.PseudoClassAssertLocatorUtils.assertPseudoClassOnlySupportsPureXPathRegardlessOfNativeSupport;
@@ -24,7 +25,7 @@
 public class SQCssFirstPseudoClassTest {
 
     public static final String FIRST_PSEUDO = ":first";
-    public static final String FIRST_XPATH_EXPRESSION = ".//*[position() = 1]";
+    public static final String FIRST_XPATH_EXPRESSION = "(.//*)[position() = 1]";
 
     @Test
     public void translate() {
@@ -34,7 +35,7 @@ public void translate() {
     @Test
     public void toSQLocator__when_driver_does_NOT_have_native_support() {
         assertPseudoClassOnlySupportsPureXPathRegardlessOfNativeSupport(
-                new SQCssFirstPseudoClass(),
+                new SQCssFirstPseudoClass(PseudoClassTestUtils.EMPTY),
                 FIRST_PSEUDO,
                 FIRST_XPATH_EXPRESSION
         );
