Issue48 (#49)

* Closes #48

Author: nachg

.github/badges/branches.svg

@@ -22,7 +22,7 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-version = "0.0.2"
+version = "0.0.3"
 
 plugins {
     kotlin("jvm") version "1.5.0"

.github/badges/jacoco.svg

@@ -1,5 +1,7 @@
 constants:
   text_arg: "@text_test"
+  upperCase: "true"
+  id_arg: "@resource-id"
 
 timeouts:
   default: 100

build.gradle.kts

@@ -17,18 +17,18 @@ Apache Maven
 <dependency>
   <groupId>org.xpathqs</groupId>
   <artifactId>xpathqs-core</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.3</version>
 </dependency>
 ```
 
 Gradle Kotlin DSL
 ```kotlin
-implementation("org.xpathqs:xpathqs-core:0.0.1")
+implementation("org.xpathqs:xpathqs-core:0.0.3")
 ```
 
 Gradle Groovy DSL
 ```groovy
-implementation 'org.xpathqs:xpathqs-core:0.0.1'
+implementation 'org.xpathqs:xpathqs-core:0.0.3'
 ```
 
 ## Quick Example

out/test/resources/config/config.yml

@@ -70,6 +70,13 @@ open class CoreGlobalProps(
      */
     val ID_ARG: String
         get() = props["constants.id_arg"] as? String ?: "@id"
+
+    /**
+     * Converts tags in [org.xpathqs.core.selector.selector.Selector.toXpath] to upper case
+     * Upper case for tag is a requirement for such HTML parsers like `NekoHtml`
+     */
+    val UPPER_CASE_FOR_TAG: Boolean
+        get() = (props["constants.upperCase"] as? String)?.toBoolean() ?: false
 }
 
 /**

readme.md

@@ -22,6 +22,7 @@
 
 package org.xpathqs.core.selector.selector
 
+import org.xpathqs.core.constants.Global
 import org.xpathqs.core.selector.args.SelectorArgs
 import org.xpathqs.core.selector.base.BaseSelectorProps
 
@@ -40,6 +41,7 @@ open class SelectorProps(
      * Get Xpath string based on [prefix] + [tag] + [args]
      */
     override fun toXpath(): String {
+        val tag = if (Global.UPPER_CASE_FOR_TAG) this.tag.uppercase() else this.tag
         return "$prefix$tag${args.toXpath()}"
     }
 

src/main/kotlin/org/xpathqs/core/constants/Global.kt

@@ -24,14 +24,27 @@ package org.xpathqs.core.util
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
 import org.xpathqs.core.constants.CoreGlobalProps
+import org.xpathqs.core.constants.Global
+import org.xpathqs.core.selector.extensions.id
+import org.xpathqs.core.selector.extensions.text
+import org.xpathqs.core.util.SelectorFactory.tagSelector
+import org.xpathqs.xpathShouldBe
 
 internal class PropertyFacadeTest {
 
     val PATH = "config/config.yml"
 
+    @AfterEach
+    fun restoreDefaults() {
+        Global.update(
+            CoreGlobalProps("config/configDefault.yml")
+        )
+    }
+
     @Test
     fun parseWithInputStream() {
         assertThat(
@@ -54,4 +67,19 @@ internal class PropertyFacadeTest {
         ).isEqualTo("@text_test")
     }
 
+    @Test
+    fun tagSelectorDefault() {
+        tagSelector("div").text("hello").id("someId")
+            .xpathShouldBe("//div[text()='hello' and @id='someId']")
+    }
+
+    @Test
+    fun tagSelectorOverridden() {
+        Global.update(
+            CoreGlobalProps("config/config.yml")
+        )
+        tagSelector("div").text("hello").id("someId")
+            .xpathShouldBe("//DIV[@text_test='hello' and @resource-id='someId']")
+    }
+
 }

src/main/kotlin/org/xpathqs/core/selector/selector/SelectorProps.kt

@@ -1,5 +1,7 @@
 constants:
   text_arg: "@text_test"
+  upperCase: "true"
+  id_arg: "@resource-id"
 
 timeouts:
   default: 100

src/test/kotlin/org/xpathqs/core/util/PropertyFacadeTest.kt

@@ -0,0 +1,7 @@
+constants:
+  text_arg: "text()"
+  upperCase: "false"
+  id_arg: "@id"
+
+timeouts:
+  default: 100