Skip to content

Commit 92416f0

Browse files
martenrebanemartenrebane
committed
Fix running tests in Codemagic
1 parent 5cc9c74 commit 92416f0

12 files changed

Lines changed: 86 additions & 30 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ android {
113113
nativeSymbolUploadEnabled = true
114114
mappingFileUploadEnabled = true
115115
}
116-
enableUnitTestCoverage = true
117-
enableAndroidTestCoverage = true
116+
enableUnitTestCoverage = false
117+
enableAndroidTestCoverage = false
118118
}
119119

120120
release {

‎codemagic.yaml‎

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,39 @@ workflows:
145145
- name: Launch emulator for instrumented tests
146146
script: |
147147
cd $ANDROID_HOME/tools
148-
emulator -avd emulator-35 -memory 4096 &
148+
149+
emulator -avd emulator-36 \
150+
-memory 8192 \
151+
-no-window \
152+
-no-audio \
153+
-no-boot-anim \
154+
-no-snapshot \
155+
-wipe-data \
156+
-cores 2 &
157+
149158
adb wait-for-device
159+
160+
echo "Booting emulator..."
161+
until [[ "$(adb shell getprop sys.boot_completed 2>/dev/null)" == "1" ]]; do
162+
printf '.'
163+
sleep 5
164+
done
165+
echo " Emulator booted!"
166+
167+
sleep 5
168+
169+
echo "Emulator is ready"
150170
when:
151171
condition: ${{ inputs.enableTests_input }}
152172
- name: Run instrumented tests
153173
script: |
154174
set -e
155175
cd $CM_BUILD_DIR
156-
./gradlew connectedDebugAndroidTest -Dorg.gradle.jvmargs="-Xmx4g"
176+
177+
./gradlew connectedDebugAndroidTest \
178+
-Dorg.gradle.jvmargs="-Xmx4g" \
179+
-Dorg.gradle.daemon=false
180+
157181
adb logcat -d > emulator.log
158182
when:
159183
condition: ${{ inputs.enableTests_input }}
@@ -245,13 +269,37 @@ workflows:
245269
- name: Launch emulator for instrumented tests
246270
script: |
247271
cd $ANDROID_HOME/tools
248-
emulator -avd emulator-35 -memory 4096 &
272+
273+
emulator -avd emulator-36 \
274+
-memory 8192 \
275+
-no-window \
276+
-no-audio \
277+
-no-boot-anim \
278+
-no-snapshot \
279+
-wipe-data \
280+
-cores 2 &
281+
249282
adb wait-for-device
283+
284+
echo "Booting emulator..."
285+
until [[ "$(adb shell getprop sys.boot_completed 2>/dev/null)" == "1" ]]; do
286+
printf '.'
287+
sleep 5
288+
done
289+
echo " Emulator booted!"
290+
291+
sleep 5
292+
293+
echo "Emulator is ready"
250294
- name: Run instrumented tests
251295
script: |
252296
set -e
253297
cd $CM_BUILD_DIR
254-
./gradlew clean connectedDebugAndroidTest -Dorg.gradle.jvmargs="-Xmx4g"
298+
299+
./gradlew connectedDebugAndroidTest \
300+
-Dorg.gradle.jvmargs="-Xmx4g" \
301+
-Dorg.gradle.daemon=false
302+
255303
adb logcat -d > emulator.log
256304
- name: Build RIA DigiDoc
257305
script: |

‎commons-lib/build.gradle.kts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ android {
1515
minSdk = Integer.parseInt(libs.versions.minSdkVersion.get())
1616

1717
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
consumerProguardFiles("consumer-rules.pro")
1819
}
1920

2021
compileOptions {
@@ -28,10 +29,14 @@ android {
2829
}
2930
}
3031

32+
buildFeatures {
33+
buildConfig = true
34+
}
35+
3136
buildTypes {
3237
debug {
33-
enableUnitTestCoverage = true
34-
enableAndroidTestCoverage = true
38+
enableUnitTestCoverage = false
39+
enableAndroidTestCoverage = false
3540
}
3641
}
3742

‎config-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ android {
3535

3636
buildTypes {
3737
debug {
38-
enableUnitTestCoverage = true
39-
enableAndroidTestCoverage = true
38+
enableUnitTestCoverage = false
39+
enableAndroidTestCoverage = false
4040
}
4141
}
4242

‎crypto-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545

4646
buildTypes {
4747
debug {
48-
enableUnitTestCoverage = true
49-
enableAndroidTestCoverage = true
48+
enableUnitTestCoverage = false
49+
enableAndroidTestCoverage = false
5050
}
5151
}
5252

‎crypto-lib/src/androidTest/kotlin/ee/ria/DigiDoc/cryptolib/CryptoContainerTest.kt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ class CryptoContainerTest {
578578
@Test
579579
fun cryptoContainer_decrypt_offlineSuccess() =
580580
runTest {
581-
val isTestEnabled = System.getenv("WITH_CRYTO_LIB_TESTS")?.toBoolean() == true
582-
assumeTrue("Skipping test: WITH_CRYTO_LIB_TESTS not true", isTestEnabled)
581+
val isTestEnabled = System.getenv("WITH_CRYPTO_LIB_TESTS")?.toBoolean() == true
582+
assumeTrue("Skipping test: WITH_CRYPTO_LIB_TESTS not true", isTestEnabled)
583583

584584
preferences
585585
.edit()
@@ -784,8 +784,8 @@ class CryptoContainerTest {
784784
@Test(expected = CDocException::class)
785785
fun cryptoContainer_decrypt_CDOC1RSAException() =
786786
runTest {
787-
val isTestEnabled = System.getenv("WITH_CRYTO_LIB_TESTS")?.toBoolean() == true
788-
assumeTrue("Skipping test: WITH_CRYTO_LIB_TESTS not true", isTestEnabled)
787+
val isTestEnabled = System.getenv("WITH_CRYPTO_LIB_TESTS")?.toBoolean() == true
788+
assumeTrue("Skipping test: WITH_CRYPTO_LIB_TESTS not true", isTestEnabled)
789789

790790
preferences
791791
.edit()
@@ -895,6 +895,9 @@ class CryptoContainerTest {
895895
@Test
896896
fun cryptoContainer_encrypt_CDOC2OnlineSuccess() =
897897
runTest {
898+
val isTestEnabled = System.getenv("WITH_CRYPTO_LIB_TESTS")?.toBoolean() == true
899+
assumeTrue("Skipping test: WITH_CRYPTO_LIB_TESTS not true", isTestEnabled)
900+
898901
preferences
899902
.edit()
900903
.putBoolean(
@@ -939,8 +942,8 @@ class CryptoContainerTest {
939942
@Test
940943
fun cryptoContainer_encrypt_CDOC1Success() =
941944
runTest {
942-
val isTestEnabled = System.getenv("WITH_CRYTO_LIB_TESTS")?.toBoolean() == true
943-
assumeTrue("Skipping test: WITH_CRYTO_LIB_TESTS not true", isTestEnabled)
945+
val isTestEnabled = System.getenv("WITH_CRYPTO_LIB_TESTS")?.toBoolean() == true
946+
assumeTrue("Skipping test: WITH_CRYPTO_LIB_TESTS not true", isTestEnabled)
944947

945948
preferences
946949
.edit()

‎id-card-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ android {
3030

3131
buildTypes {
3232
debug {
33-
enableUnitTestCoverage = true
34-
enableAndroidTestCoverage = true
33+
enableUnitTestCoverage = false
34+
enableAndroidTestCoverage = false
3535
}
3636
}
3737

‎libdigidoc-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545

4646
buildTypes {
4747
debug {
48-
enableUnitTestCoverage = true
49-
enableAndroidTestCoverage = true
48+
enableUnitTestCoverage = false
49+
enableAndroidTestCoverage = false
5050
}
5151
}
5252

‎mobile-id-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android {
3939

4040
buildTypes {
4141
debug {
42-
enableUnitTestCoverage = true
43-
enableAndroidTestCoverage = true
42+
enableUnitTestCoverage = false
43+
enableAndroidTestCoverage = false
4444
}
4545
}
4646
}

‎networking-lib/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ android {
2828

2929
buildTypes {
3030
debug {
31-
enableUnitTestCoverage = true
32-
enableAndroidTestCoverage = true
31+
enableUnitTestCoverage = false
32+
enableAndroidTestCoverage = false
3333
}
3434
}
3535
packaging {

0 commit comments

Comments
 (0)