Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tech fixes #560

Merged
merged 5 commits into from
Sep 7, 2023
Merged

Tech fixes #560

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c27e197
TECH: Fix compose test
Nikitae57 Aug 22, 2023
9305ec4
TECH: Fix typo
Nikitae57 Aug 22, 2023
c5ff5b4
TECH: Try to fix screenshot tests
Nikitae57 Aug 22, 2023
67af773
Merge branch 'master' into TECH-Fixes
Nikitae57 Sep 7, 2023
d2d508a
TECH: Skip test on API 21
Nikitae57 Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...kaspresso/interceptors/watcher/kautomator/impl/logging/LoggingObjectWatcherInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class LoggingObjectWatcherInterceptor(
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}"
"Additional info: the object was found by selector=${interaction.selector.bySelector}"
)
}

Expand All @@ -38,7 +38,7 @@ class LoggingObjectWatcherInterceptor(
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}"
"Additional info: the object was found by selector=${interaction.selector.bySelector}"
)
}
}
35 changes: 18 additions & 17 deletions .../kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.kaspersky.kaspressample.docloc_tests.advanced

import android.Manifest
import android.graphics.Color
import androidx.fragment.app.testing.FragmentScenario
import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.rule.GrantPermissionRule
import com.kaspersky.kaspressample.docloc.ScreenshotSampleFragment
Expand All @@ -16,7 +17,7 @@ import org.junit.Test
* For more information see DocLoc wiki page.
*/
class AdvancedScreenshotSampleTest : DocLocScreenshotTestCase(locales = "en,ru") {
private lateinit var view: ScreenshotSampleView
private lateinit var scenario: FragmentScenario<ScreenshotSampleFragment>

@get:Rule
val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
Expand All @@ -27,26 +28,26 @@ class AdvancedScreenshotSampleTest : DocLocScreenshotTestCase(locales = "en,ru")
@ScreenShooterTest
@Test
fun test() = before {
val scenario = launchFragmentInContainer<ScreenshotSampleFragment>()
scenario.onFragment {
view = getUiSafeProxy(it as ScreenshotSampleView)
}
scenario = launchFragmentInContainer()
}.after {
}.run {
step("1. Launch feature screen") {
view.setCounterValue(0)
view.setBackgroundColor(Color.WHITE)
captureScreenshot("1. Startup")
}
scenario.onFragment {
val view = getUiSafeProxy(it as ScreenshotSampleView)
step("1. Launch feature screen") {
view.setCounterValue(0)
view.setBackgroundColor(Color.WHITE)
captureScreenshot("1. Startup")
}

step("2. Increase counter by 5") {
view.setCounterValue(5)
captureScreenshot("2. Value has been increased by 5")
}
step("2. Increase counter by 5") {
view.setCounterValue(5)
captureScreenshot("2. Value has been increased by 5")
}

step("3. Set red background color") {
view.setBackgroundColor(Color.RED)
captureScreenshot("3. Background has been set to red")
step("3. Set red background color") {
view.setBackgroundColor(Color.RED)
captureScreenshot("3. Background has been set to red")
}
}
}
}
35 changes: 18 additions & 17 deletions ...n/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTestLegacy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.kaspersky.kaspressample.docloc_tests.advanced

import android.Manifest
import android.graphics.Color
import androidx.fragment.app.testing.FragmentScenario
import androidx.fragment.app.testing.launchFragmentInContainer
import androidx.test.rule.GrantPermissionRule
import com.kaspersky.kaspressample.docloc.ScreenshotSampleFragment
Expand All @@ -20,7 +21,7 @@ class AdvancedScreenshotSampleTestLegacy : DocLocScreenshotTestCase(
screenshotsDirectory = File("screenshots"),
locales = "en,ru"
) {
private lateinit var view: ScreenshotSampleView
private lateinit var scenario: FragmentScenario<ScreenshotSampleFragment>

@get:Rule
val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
Expand All @@ -31,26 +32,26 @@ class AdvancedScreenshotSampleTestLegacy : DocLocScreenshotTestCase(
@ScreenShooterTest
@Test
fun test() = before {
val scenario = launchFragmentInContainer<ScreenshotSampleFragment>()
scenario.onFragment {
view = getUiSafeProxy(it as ScreenshotSampleView)
}
scenario = launchFragmentInContainer<ScreenshotSampleFragment>()
}.after {
}.run {
step("1. Launch feature screen") {
view.setCounterValue(0)
view.setBackgroundColor(Color.WHITE)
captureScreenshot("1. Startup")
}
scenario.onFragment {
val view = getUiSafeProxy(it as ScreenshotSampleView)
step("1. Launch feature screen") {
view.setCounterValue(0)
view.setBackgroundColor(Color.WHITE)
captureScreenshot("1. Startup")
}

step("2. Increase counter by 5") {
view.setCounterValue(5)
captureScreenshot("2. Value has been increased by 5")
}
step("2. Increase counter by 5") {
view.setCounterValue(5)
captureScreenshot("2. Value has been increased by 5")
}

step("3. Set red background color") {
view.setBackgroundColor(Color.RED)
captureScreenshot("3. Background has been set to red")
step("3. Set red background color") {
view.setBackgroundColor(Color.RED)
captureScreenshot("3. Background has been set to red")
}
}
}
}
Loading