feature=kas_kau_improvements: elementClassName => description

AlexeyKorshun · Jan 30, 2020 · 7e7d3fd · 7e7d3fd
1 parent 78bea79
commit 7e7d3fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...kaspresso/interceptors/watcher/kautomator/impl/logging/LoggingObjectWatcherInterceptor.kt b/...kaspresso/interceptors/watcher/kautomator/impl/logging/LoggingObjectWatcherInterceptor.kt
@@ -21,8 +21,9 @@ class LoggingObjectWatcherInterceptor(
      * @param assertion responsible for performing an activity (assertion) on the given [interaction]
      */
     override fun interceptCheck(interaction: UiObjectInteraction, assertion: UiObjectAssertion) {
-        logger.i("Check=${assertion.type}(description={${assertion.description}} is executing on " +
-                "${interaction.elementClassName}) that was founded by selector=${interaction.selector.bySelector}")
+        logger.i("The object: ${interaction.description}. " +
+                "The operation: Check=${assertion.type}(description={${assertion.description}}. " +
+                "Additional info: the object was founded by selector=${interaction.selector.bySelector}")
     }
 
     /**
@@ -32,7 +33,8 @@ class LoggingObjectWatcherInterceptor(
      * @param action responsible for performing an activity (action) on the given [interaction]
      */
     override fun interceptPerform(interaction: UiObjectInteraction, action: UiObjectAction) {
-        logger.i("Action=${action.type}(description={${action.description}} is executing on " +
-                "${interaction.elementClassName}) that was founded by selector=${interaction.selector.bySelector}")
+        logger.i("The object: ${interaction.description}. " +
+                "The operation: Action=${action.type}(description={${action.description}}. " +
+                "Additional info: the object was founded by selector=${interaction.selector.bySelector}")
     }
 }
diff --git a/...omator/src/main/kotlin/com/kaspersky/components/kautomator/dsl/common/views/UiBaseView.kt b/...omator/src/main/kotlin/com/kaspersky/components/kautomator/dsl/common/views/UiBaseView.kt
@@ -31,7 +31,7 @@ open class UiBaseView<out T>(selector: UiViewSelector) : UiBaseActions, UiBaseAs
         val delegate = UiObjectDelegate(
             UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()),
             selector,
-            this::class.java.simpleName
+            "Object type=${this::class.java.simpleName}"
         )
         delegate.loadView()
         delegate

diff --git a/...main/kotlin/com/kaspersky/components/kautomator/intercepting/delegate/UiObjectDelegate.kt b/...main/kotlin/com/kaspersky/components/kautomator/intercepting/delegate/UiObjectDelegate.kt
@@ -22,10 +22,10 @@ import com.kaspersky.components.kautomator.intercepting.operation.UiOperationTyp
 class UiObjectDelegate(
     val device: UiDevice,
     val selector: UiViewSelector,
-    elementClassName: String
+    description: String
 ) : UiDelegate<UiObjectInteraction, UiObjectAssertion, UiObjectAction> {
 
-    override val interaction: UiObjectInteraction = UiObjectInteraction(device, selector, elementClassName)
+    override val interaction: UiObjectInteraction = UiObjectInteraction(device, selector, description)
     override var interceptor: UiInterceptor<UiObjectInteraction, UiObjectAssertion, UiObjectAction>? = null
 
     fun loadView(): Boolean = interaction.tryToFindUiObject()

diff --git a/...otlin/com/kaspersky/components/kautomator/intercepting/interaction/UiObjectInteraction.kt b/...otlin/com/kaspersky/components/kautomator/intercepting/interaction/UiObjectInteraction.kt
@@ -13,8 +13,7 @@ import com.kaspersky.components.kautomator.intercepting.operation.UiObjectAssert
 class UiObjectInteraction(
     val device: UiDevice,
     val selector: UiViewSelector,
-    // UiButton, UiTextView, UiEditText, etc.
-    val elementClassName: String
+    val description: String
 ) : UiInteraction<UiObjectAssertion, UiObjectAction> {
 
     var uiObject2: UiObject2? = null