Issue148 (#149)

* closes #146

Author: nachg

.github/badges/jacoco.svg

@@ -58,12 +58,9 @@ abstract class BaseSelector(
      * Build selector's xpath
      */
     override fun toXpath(): String {
-        val b = base.toXpath()
-        val p = props.toXpath()
-        if(b.isNotEmpty() && !p.startsWith("/")) {
-            return "$b//$p"
-        }
-        return b + p
+        return mergeXpath(
+            base.toXpath(), props.toXpath()
+        )
     }
 
     /**
@@ -80,4 +77,16 @@ abstract class BaseSelector(
             xpath
         }
     }
+
+    companion object {
+        fun mergeXpath(xp1: String, xp2: String): String {
+            if(xp1.isNotEmpty()
+                && !xp2.startsWith("/")
+                && !xp2.startsWith("[")
+            ) {
+                return "$xp1//$xp2"
+            }
+            return xp1 + xp2
+        }
+    }
 }

src/main/kotlin/org/xpathqs/core/selector/base/BaseSelector.kt

@@ -72,9 +72,9 @@ open class GroupSelector(
             }
             val props = props.toXpath()
             if (props.isNotEmpty()) {
-                "(${base.toXpath() + res})$props"
+                mergeXpath("(${base.toXpath() + res})", props)
             } else {
-                base.toXpath() + res
+                mergeXpath(base.toXpath(), res)
             }
         }
     }

src/main/kotlin/org/xpathqs/core/selector/group/GroupSelector.kt

@@ -37,6 +37,7 @@ internal class SelectorReflectionFieldsTest {
         BaseSelector::name.name,
         BaseSelector::annotations.name,
         BaseSelector::field.name,
+        "Companion"
     )
 
     @Test

src/test/kotlin/org/xpathqs/core/reflection/SelectorReflectionFieldsTest.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 XPATH-QS
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.xpathqs.core.selector.block.extensions
+
+import org.junit.jupiter.api.Test
+import org.xpathqs.core.reflection.scanPackage
+import org.xpathqs.core.selector.block.Block
+import org.xpathqs.core.selector.extensions.plus
+import org.xpathqs.core.selector.selector.followingSibling
+import org.xpathqs.core.util.SelectorFactory.tagSelector
+import org.xpathqs.xpathShouldBe
+
+object Page1 : Block(tagSelector("base")) {
+    val s1 = tagSelector("base").followingSibling()
+    val s2 = tagSelector("base").followingSibling() + tagSelector("div")
+}
+
+class AxeExtensionsTest {
+    init {
+        Page1::class.java.packageName.scanPackage()
+    }
+
+    @Test
+    fun followingWithBase() {
+        Page1.s1
+            .xpathShouldBe("//base//following-sibling::base")
+    }
+
+    @Test
+    fun followingWithBaseAndGroup() {
+        Page1.s2
+            .xpathShouldBe("//base//following-sibling::base//div")
+    }
+}