fix packages and build errors
This commit is contained in:
@@ -1,9 +1,24 @@
|
|||||||
plugins {
|
plugins {
|
||||||
androidApplication
|
kotlinAndroid
|
||||||
|
androidLibrary
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "ru.samsung.test.core"
|
namespace = "ru.samsung.test.core"
|
||||||
|
compileSdk = Version.Android.Sdk.compile
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
minSdk = Version.Android.Sdk.min
|
||||||
|
}
|
||||||
|
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility = Version.Kotlin.javaSource
|
||||||
|
targetCompatibility = Version.Kotlin.javaSource
|
||||||
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = Version.Kotlin.jvmTarget
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.innovationcampus.test.core.core
|
package ru.samsung.test.core.core
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.Instrumentation
|
import android.app.Instrumentation
|
||||||
@@ -20,16 +20,20 @@ import org.junit.Before
|
|||||||
import org.junit.FixMethodOrder
|
import org.junit.FixMethodOrder
|
||||||
import org.junit.Rule
|
import org.junit.Rule
|
||||||
import org.junit.runners.MethodSorters
|
import org.junit.runners.MethodSorters
|
||||||
import ru.innovationcampus.test.core.utils.ResultTestsData
|
import ru.samsung.test.core.utils.EmptyRule
|
||||||
|
import ru.samsung.test.core.utils.ResultTestsData
|
||||||
|
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
open class BaseTest<LaunchActivity : Activity>(
|
open class BaseTest<LaunchActivity : Activity>(
|
||||||
private val clazz: Class<LaunchActivity>
|
private val clazz: Class<LaunchActivity>,
|
||||||
|
private val isEnabledCompose: Boolean = false
|
||||||
) : TestCase(kaspressoBuilder = Kaspresso.Builder.simple {
|
) : TestCase(kaspressoBuilder = Kaspresso.Builder.simple {
|
||||||
kautomatorWaitForIdleSettings = KautomatorWaitForIdleSettings.boost()
|
kautomatorWaitForIdleSettings = KautomatorWaitForIdleSettings.boost()
|
||||||
}.apply { addComposeSupport() }) {
|
}.apply {
|
||||||
|
if (isEnabledCompose) addComposeSupport()
|
||||||
|
}) {
|
||||||
@get:Rule
|
@get:Rule
|
||||||
val composeTestRule = createComposeRule()
|
val composeTestRule = if (isEnabledCompose) createComposeRule() else EmptyRule()
|
||||||
|
|
||||||
protected lateinit var activityScenario: ActivityScenario<LaunchActivity>
|
protected lateinit var activityScenario: ActivityScenario<LaunchActivity>
|
||||||
private set
|
private set
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.innovationcampus.test.core.core
|
package ru.samsung.test.core.core
|
||||||
|
|
||||||
import android.app.Instrumentation
|
import android.app.Instrumentation
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
|||||||
6
src/main/java/ru/samsung/test/core/utils/EmptyRule.kt
Normal file
6
src/main/java/ru/samsung/test/core/utils/EmptyRule.kt
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
package ru.samsung.test.core.utils
|
||||||
|
|
||||||
|
import org.junit.rules.TestRule
|
||||||
|
import org.junit.rules.TestWatcher
|
||||||
|
|
||||||
|
class EmptyRule : TestWatcher()
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
package ru.innovationcampus.test.core.utils
|
package ru.samsung.test.core.utils
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
import android.app.Instrumentation
|
import android.app.Instrumentation
|
||||||
import android.app.Instrumentation.ActivityResult
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.test.platform.app.InstrumentationRegistry
|
|
||||||
import androidx.test.uiautomator.UiDevice
|
import androidx.test.uiautomator.UiDevice
|
||||||
|
|
||||||
object ResultTestsData {
|
object ResultTestsData {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.innovationcampus.test.core.utils
|
package ru.samsung.test.core.utils
|
||||||
|
|
||||||
import com.google.common.truth.Truth.assertThat
|
import com.google.common.truth.Truth.assertThat
|
||||||
import com.kaspersky.components.kautomator.component.text.UiTextViewAssertions
|
import com.kaspersky.components.kautomator.component.text.UiTextViewAssertions
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.innovationcampus.test.core.utils
|
package ru.samsung.test.core.utils
|
||||||
|
|
||||||
import com.kaspersky.components.kautomator.component.common.builders.UiViewBuilder
|
import com.kaspersky.components.kautomator.component.common.builders.UiViewBuilder
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package ru.innovationcampus.test.core.utils
|
package ru.samsung.test.core.utils
|
||||||
|
|
||||||
import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
|
import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
|
||||||
import io.github.kakaocup.compose.node.element.ComposeScreen
|
import io.github.kakaocup.compose.node.element.ComposeScreen
|
||||||
|
|||||||
Reference in New Issue
Block a user