Parser Fix (#47)

* Fix SelectorParse.parse

Author: nachg

src/main/kotlin/org/xpathqs/core/reflection/PackageScanner.kt

@@ -38,10 +38,10 @@ class PackageScanner(
     /**
      * Scan provided package
      */
-    constructor(packageName: String): this(Reflections(packageName))
+    constructor(packageName: String) : this(Reflections(packageName))
 
     val packageObjects: Collection<Block> by lazy {
-           scanner.getSubTypesOf(Block::class.java).filter {
+        scanner.getSubTypesOf(Block::class.java).filter {
             it.isObject()
         }.map {
             it.getObject()

src/main/kotlin/org/xpathqs/core/reflection/ReflectionExtensions.kt

@@ -41,10 +41,10 @@ import kotlin.reflect.KProperty
  * @sample org.xpathqs.core.reflection.extensions.ReflectionExtensionsIsObjectTests
  */
 internal fun Any.isObject(): Boolean {
-    if(this is Class<*>) {
+    if (this is Class<*>) {
         return this.declaredFields
             .find {
-                it.name ==  "INSTANCE"
+                it.name == "INSTANCE"
             } != null
     }
     return this.javaClass.declaredFields

src/main/kotlin/org/xpathqs/core/reflection/SelectorParser.kt

@@ -24,8 +24,8 @@ package org.xpathqs.core.reflection
 
 import org.xpathqs.core.selector.Block
 import org.xpathqs.core.selector.NullSelector
+import org.xpathqs.core.selector.base.BaseSelector
 import org.xpathqs.core.selector.base.ISelector
-import org.xpathqs.core.selector.selector.Selector
 
 /**
  * Class for initializing Selectors names and structure via Reflection
@@ -52,7 +52,7 @@ internal class SelectorParser(
 
         srf.innerSelectorFields.forEach {
             it.isAccessible = true
-            val sel = it.get(rootObj) as Selector
+            val sel = it.get(rootObj) as BaseSelector
             sel.setName(rootObj.name + "." + it.name)
             sel.setBase(rootObj)
             sel.freeze()

src/main/kotlin/org/xpathqs/core/reflection/SelectorReflectionFields.kt

@@ -24,7 +24,6 @@ package org.xpathqs.core.reflection
 
 import org.xpathqs.core.selector.Block
 import org.xpathqs.core.selector.base.BaseSelector
-import org.xpathqs.core.selector.selector.Selector
 import java.lang.reflect.Field
 
 /**
@@ -39,7 +38,7 @@ class SelectorReflectionFields(
      * Returns collection of [BaseSelector]s inner objects of [rootObj]
      */
     val innerSelectors: Collection<BaseSelector> by lazy {
-        innerSelectorFields.map { it.get(rootObj) as Selector }
+        innerSelectorFields.map { it.get(rootObj) as BaseSelector }
     }
 
     /**
@@ -79,6 +78,7 @@ class SelectorReflectionFields(
                 if (rootObj::class.java.simpleName != BaseSelector::class.java.simpleName) {
                     rootObj::class.java.declaredFields.forEach {
                         if (it.type.isSelectorSubtype()) {
+                            it.isAccessible = true
                             res.add(it)
                         }
                     }

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

@@ -24,7 +24,9 @@ package org.xpathqs.core.reflection
 
 import assertk.assertAll
 import assertk.assertThat
-import assertk.assertions.*
+import assertk.assertions.containsExactlyInAnyOrder
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
 import org.junit.jupiter.api.Test
 import org.xpathqs.core.reflection.packagescannertestpages.Page1
 import org.xpathqs.core.reflection.packagescannertestpages.Page2

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

@@ -84,6 +84,28 @@ internal class SelectorReflectionFieldsTest {
             )
     }
 
+    @Test
+    fun innerSelectorFieldsWithInnerGroupObject() {
+        val actual = SelectorReflectionFields(PageWithBaseAndInnerGroupObject).innerSelectorFields
+        val names = actual.map { it.name }
+
+        assertThat(names)
+            .containsExactlyInAnyOrder(
+                "s1_base"
+            )
+    }
+
+    @Test
+    fun innerSelectorsWithInnerGroupObject() {
+        val actual = SelectorReflectionFields(PageWithBaseAndInnerGroupObject).innerSelectors
+        val names = actual.map { it.toXpath() }
+
+        assertThat(names)
+            .containsExactlyInAnyOrder(
+                "//base_tag"
+            )
+    }
+
     @Test
     fun innerSelectorFieldsForInnerObject() {
         val actual = SelectorReflectionFields(PageWithBaseAndInnerObject.Inner).innerSelectorFields

src/test/kotlin/org/xpathqs/core/reflection/packagescannertestpages/Page1.kt

@@ -24,4 +24,4 @@ package org.xpathqs.core.reflection.packagescannertestpages
 
 import org.xpathqs.core.selector.Block
 
-object Page1: Block()
+object Page1 : Block()

src/test/kotlin/org/xpathqs/core/reflection/packagescannertestpages/Page2.kt

@@ -24,4 +24,4 @@ package org.xpathqs.core.reflection.packagescannertestpages
 
 import org.xpathqs.core.selector.Block
 
-object Page2: Block()
+object Page2 : Block()

src/test/kotlin/org/xpathqs/core/reflection/packagescannertestpages/innerpackage/Page3.kt

@@ -24,4 +24,4 @@ package org.xpathqs.core.reflection.packagescannertestpages.innerpackage
 
 import org.xpathqs.core.selector.Block
 
-object Page3: Block()
+object Page3 : Block()

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

@@ -29,6 +29,8 @@ import org.xpathqs.core.selector.selector.Selector
 import org.xpathqs.core.selector.selector.SelectorProps
 import org.xpathqs.core.util.SelectorFactory.tagSelector
 
+open class Block2 : Block()
+
 object PageWithBase : Block(
     Selector(
         props = SelectorProps(tag = "base")
@@ -37,6 +39,16 @@ object PageWithBase : Block(
     val s1 = Selector(props = SelectorProps(tag = "s1"))
 }
 
+object PageWithGroupBase : Block(
+    tagSelector("div") + tagSelector("p")
+) {
+    val s1 = Selector(props = SelectorProps(tag = "s1"))
+}
+
+object PageWithInhGroup : Block2() {
+    val s1 = tagSelector("div") + tagSelector("p")
+}
+
 object PageNoBase : Block() {
     val s1 = Selector(props = SelectorProps(tag = "s1"))
 }
@@ -63,4 +75,18 @@ object PageWithBaseAndInnerObject : Block(
     ) {
         val s1_inner = Selector(props = SelectorProps(tag = "inner_tag"))
     }
+}
+
+object PageWithBaseAndInnerGroupObject : Block(
+    Selector(
+        props = SelectorProps(tag = "base")
+    )
+) {
+    val s1_base = Selector(props = SelectorProps(tag = "base_tag"))
+
+    object Inner : Block(
+        tagSelector("div") + tagSelector("p")
+    ) {
+        val s1_inner = Selector(props = SelectorProps(tag = "inner_tag"))
+    }
 }