Skip to content

Commit 8f0dd84

Browse files
ovitrifovitrif
committed
refactor: shorten test markers
1 parent ec0010e commit 8f0dd84

28 files changed

Lines changed: 63 additions & 71 deletions

‎.github/workflows/ui-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ jobs:
120120
121121
IFS=',' read -ra requested_suites <<< "$suites"
122122
for suite in "${requested_suites[@]}"; do
123-
if [[ "$suite" == *.* || ! "$suite" =~ ^[A-Z][A-Za-z0-9]*AndroidTest$ ]]; then
124-
echo "::error::Invalid Android test annotation '$suite'. Use all or comma-separated simple annotation names such as DeviceUiIntegrationAndroidTest."
123+
if [[ "$suite" == *.* || ! "$suite" =~ ^[A-Z][A-Za-z0-9]*$ ]]; then
124+
echo "::error::Invalid Android test annotation '$suite'. Use all or comma-separated simple annotation names such as ComposeUi."
125125
exit 1
126126
fi
127127

‎app/build.gradle.kts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,22 @@ val e2eHomegateUrlEnv = System.getenv("E2E_HOMEGATE_URL") ?: "http://127.0.0.1:6
5151
val trezorBridgeEnv = System.getenv("TREZOR_BRIDGE")?.toBoolean()?.toString() ?: "false"
5252
val trezorBridgeUrlEnv = System.getenv("TREZOR_BRIDGE_URL") ?: "http://10.0.2.2:21325"
5353
val androidTestAnnotationPackage = "to.bitkit.test.annotations"
54-
val androidTestAnnotationSuffix = "AndroidTest"
5554
val androidTestTaskPrefix = "connectedDevDebug"
5655
val androidTestTaskSuffix = "AndroidTest"
5756
val androidTestAnnotationNames = file("src/androidTest/java/to/bitkit/test/annotations")
5857
.listFiles()
5958
?.mapNotNull { file ->
6059
file.nameWithoutExtension.takeIf {
6160
file.isFile &&
62-
file.extension == "kt" &&
63-
it.endsWith(androidTestAnnotationSuffix)
61+
file.extension == "kt"
6462
}
6563
}
6664
?.sorted()
6765
.orEmpty()
6866
val requestedTaskNames = gradle.startParameter.taskNames.map { it.substringAfterLast(":") }
6967

7068
fun androidTestTaskName(annotationName: String): String {
71-
val taskInfix = annotationName.removeSuffix(androidTestAnnotationSuffix)
72-
return "$androidTestTaskPrefix$taskInfix$androidTestTaskSuffix"
69+
return "$androidTestTaskPrefix$annotationName$androidTestTaskSuffix"
7370
}
7471

7572
val requestedAndroidTestAnnotation = providers.gradleProperty("bitkitAndroidTestAnnotation")
@@ -78,7 +75,7 @@ val requestedAndroidTestAnnotation = providers.gradleProperty("bitkitAndroidTest
7875
?.takeIf { it.isNotEmpty() }
7976
?.also {
8077
require('.' !in it) {
81-
"Use a simple Android test annotation name, e.g. 'DeviceUiIntegrationAndroidTest'."
78+
"Use a simple Android test annotation name, e.g. 'ComposeUi'."
8279
}
8380
require(it in androidTestAnnotationNames) {
8481
"Unsupported bitkitAndroidTestAnnotation '$it'. Supported annotations: " +

‎app/src/androidTest/java/to/bitkit/data/keychain/KeychainTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import org.junit.runner.RunWith
1414
import to.bitkit.data.AppDb
1515
import to.bitkit.data.entities.ConfigEntity
1616
import to.bitkit.test.BaseAndroidTest
17-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
18-
import to.bitkit.test.annotations.DeviceStorageIntegrationAndroidTest
17+
import to.bitkit.test.annotations.DeviceIntegration
18+
import to.bitkit.test.annotations.DeviceStorageIntegration
1919
import kotlin.test.assertEquals
2020
import kotlin.test.assertFailsWith
2121
import kotlin.test.assertNull
2222
import kotlin.test.assertTrue
2323

2424
@RunWith(AndroidJUnit4::class)
25-
@DeviceIntegrationAndroidTest
26-
@DeviceStorageIntegrationAndroidTest
25+
@DeviceIntegration
26+
@DeviceStorageIntegration
2727
class KeychainTest : BaseAndroidTest() {
2828

2929
private val appContext by lazy { ApplicationProvider.getApplicationContext<Context>() }

‎app/src/androidTest/java/to/bitkit/services/BlocktankTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ import org.junit.Before
1515
import org.junit.Rule
1616
import org.junit.Test
1717
import to.bitkit.env.Env
18-
import to.bitkit.test.annotations.CoreServiceIntegrationAndroidTest
19-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
18+
import to.bitkit.test.annotations.CoreServiceIntegration
19+
import to.bitkit.test.annotations.DeviceIntegration
2020
import javax.inject.Inject
2121
import kotlin.test.assertEquals
2222
import kotlin.test.assertNotEquals
2323
import kotlin.test.assertNotNull
2424
import kotlin.test.assertTrue
2525

2626
@HiltAndroidTest
27-
@DeviceIntegrationAndroidTest
28-
@CoreServiceIntegrationAndroidTest
27+
@DeviceIntegration
28+
@CoreServiceIntegration
2929
class BlocktankTest {
3030
@get:Rule
3131
var hiltRule = HiltAndroidRule(this)

‎app/src/androidTest/java/to/bitkit/services/OnchainServiceTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import org.junit.Test
88
import org.junit.runner.RunWith
99
import org.lightningdevkit.ldknode.Network
1010
import to.bitkit.models.toDerivationPath
11-
import to.bitkit.test.annotations.CoreServiceIntegrationAndroidTest
12-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
11+
import to.bitkit.test.annotations.CoreServiceIntegration
12+
import to.bitkit.test.annotations.DeviceIntegration
1313
import kotlin.test.assertEquals
1414
import kotlin.test.assertNotNull
1515
import kotlin.test.assertTrue
1616

1717
@RunWith(AndroidJUnit4::class)
18-
@DeviceIntegrationAndroidTest
19-
@CoreServiceIntegrationAndroidTest
18+
@DeviceIntegration
19+
@CoreServiceIntegration
2020
class OnchainServiceTests {
2121
private lateinit var onchainService: OnchainService
2222

‎app/src/androidTest/java/to/bitkit/services/RoutingFeeEstimationTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import to.bitkit.data.CacheStore
1818
import to.bitkit.data.keychain.Keychain
1919
import to.bitkit.env.Env
2020
import to.bitkit.repositories.WalletRepo
21-
import to.bitkit.test.annotations.CoreServiceIntegrationAndroidTest
22-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
21+
import to.bitkit.test.annotations.CoreServiceIntegration
22+
import to.bitkit.test.annotations.DeviceIntegration
2323
import to.bitkit.utils.LdkError
2424
import javax.inject.Inject
2525
import kotlin.test.assertEquals
@@ -29,8 +29,8 @@ import kotlin.test.assertTrue
2929

3030
@HiltAndroidTest
3131
@RunWith(AndroidJUnit4::class)
32-
@DeviceIntegrationAndroidTest
33-
@CoreServiceIntegrationAndroidTest
32+
@DeviceIntegration
33+
@CoreServiceIntegration
3434
class RoutingFeeEstimationTest {
3535

3636
companion object {

‎app/src/androidTest/java/to/bitkit/services/TxBumpingTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import org.junit.runner.RunWith
1515
import to.bitkit.data.keychain.Keychain
1616
import to.bitkit.env.Env
1717
import to.bitkit.repositories.WalletRepo
18-
import to.bitkit.test.annotations.CoreServiceIntegrationAndroidTest
19-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
18+
import to.bitkit.test.annotations.CoreServiceIntegration
19+
import to.bitkit.test.annotations.DeviceIntegration
2020
import javax.inject.Inject
2121
import kotlin.test.assertEquals
2222
import kotlin.test.assertFalse
@@ -25,8 +25,8 @@ import kotlin.test.assertTrue
2525

2626
@HiltAndroidTest
2727
@RunWith(AndroidJUnit4::class)
28-
@DeviceIntegrationAndroidTest
29-
@CoreServiceIntegrationAndroidTest
28+
@DeviceIntegration
29+
@CoreServiceIntegration
3030
class TxBumpingTests {
3131

3232
@get:Rule

‎app/src/androidTest/java/to/bitkit/services/UtxoSelectionTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import org.lightningdevkit.ldknode.CoinSelectionAlgorithm
1616
import to.bitkit.data.keychain.Keychain
1717
import to.bitkit.env.Env
1818
import to.bitkit.repositories.WalletRepo
19-
import to.bitkit.test.annotations.CoreServiceIntegrationAndroidTest
20-
import to.bitkit.test.annotations.DeviceIntegrationAndroidTest
19+
import to.bitkit.test.annotations.CoreServiceIntegration
20+
import to.bitkit.test.annotations.DeviceIntegration
2121
import javax.inject.Inject
2222
import kotlin.test.assertEquals
2323
import kotlin.test.assertFalse
@@ -27,8 +27,8 @@ import kotlin.test.fail
2727

2828
@HiltAndroidTest
2929
@RunWith(AndroidJUnit4::class)
30-
@DeviceIntegrationAndroidTest
31-
@CoreServiceIntegrationAndroidTest
30+
@DeviceIntegration
31+
@CoreServiceIntegration
3232
class UtxoSelectionTests {
3333

3434
@get:Rule

app/src/androidTest/java/to/bitkit/test/annotations/ComposeUiAndroidTest.kt renamed to app/src/androidTest/java/to/bitkit/test/annotations/ComposeUi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package to.bitkit.test.annotations
22

33
@Retention(AnnotationRetention.RUNTIME)
44
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
5-
annotation class ComposeUiAndroidTest
5+
annotation class ComposeUi

app/src/androidTest/java/to/bitkit/test/annotations/DeviceIntegrationAndroidTest.kt renamed to app/src/androidTest/java/to/bitkit/test/annotations/CoreServiceIntegration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package to.bitkit.test.annotations
22

33
@Retention(AnnotationRetention.RUNTIME)
44
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
5-
annotation class DeviceIntegrationAndroidTest
5+
annotation class CoreServiceIntegration

0 commit comments

Comments
 (0)