Skip to content

Commit a520950

Browse files
committed
Disables instrumented tests in some modules
Change-Id: I1a318f4fcba20da72042336671f35b79a0e0ec6d
1 parent 99a046e commit a520950

File tree

9 files changed

+107
-14
lines changed

9 files changed

+107
-14
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
cores: 4
131131
disk-size: 6000M
132132
heap-size: 600M
133-
script: ./gradlew connectedDebugAndroidTest --daemon --info
133+
script: ./gradlew connectedDebugAndroidTest --daemon
134134

135135

136136
- name: Upload test reports

core/network/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ android {
5050
}
5151
}
5252

53+
// Explicitly disable the connectedAndroidTest task for this module
54+
androidComponents {
55+
beforeVariants(selector().all()) { variant ->
56+
variant.enableAndroidTest = false
57+
}
58+
}
59+
5360
dependencies {
5461
implementation(libs.androidx.app.startup)
5562
implementation(libs.kotlinx.serialization.json)

core/testing/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ android {
3939
}
4040
}
4141

42+
// Explicitly disable the connectedAndroidTest task for this module
43+
androidComponents {
44+
beforeVariants(selector().all()) { variant ->
45+
variant.enableAndroidTest = false
46+
}
47+
}
48+
4249
dependencies {
4350
api(libs.kotlinx.coroutines.test)
4451
implementation(platform(libs.androidx.compose.bom))

core/util/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ android {
2727

2828
defaultConfig {
2929
minSdk = libs.versions.minSdk.get().toInt()
30-
testInstrumentationRunner = "com.android.developers.testing.AndroidifyTestRunner"
3130
}
3231

3332
compileOptions {
@@ -38,6 +37,12 @@ android {
3837
jvmTarget = libs.versions.jvmTarget.get()
3938
}
4039
}
40+
// Explicitly disable the connectedAndroidTest task for this module
41+
androidComponents {
42+
beforeVariants(selector().all()) { variant ->
43+
variant.enableAndroidTest = false
44+
}
45+
}
4146

4247
dependencies {
4348
implementation(platform(libs.androidx.compose.bom))
@@ -51,12 +56,6 @@ dependencies {
5156
implementation(libs.androidx.window.core)
5257
ksp(libs.hilt.compiler)
5358

54-
androidTestImplementation(platform(libs.androidx.compose.bom))
55-
androidTestImplementation(libs.androidx.ui.test.junit4)
56-
androidTestImplementation(libs.hilt.android.testing)
57-
androidTestImplementation(project(":core:testing")) // Add dependency
58-
kspAndroidTest(libs.hilt.compiler)
59-
6059
// debugImplementation(libs.androidx.ui.tooling)
6160
// debugImplementation(libs.androidx.ui.test.manifest)
6261
}

data/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ android {
2727

2828
defaultConfig {
2929
minSdk = libs.versions.minSdk.get().toInt()
30-
testInstrumentationRunner = "com.android.developers.testing.AndroidifyTestRunner"
3130
}
3231

3332
compileOptions {
@@ -38,6 +37,12 @@ android {
3837
jvmTarget = libs.versions.jvmTarget.get()
3938
}
4039
}
40+
// Explicitly disable the connectedAndroidTest task for this module
41+
androidComponents {
42+
beforeVariants(selector().all()) { variant ->
43+
variant.enableAndroidTest = false
44+
}
45+
}
4146

4247
dependencies {
4348
implementation(project(":core:network"))
@@ -55,9 +60,4 @@ dependencies {
5560
exclude(group = "com.google.guava")
5661
}
5762
ksp(libs.hilt.compiler)
58-
59-
androidTestImplementation(libs.androidx.ui.test.junit4)
60-
androidTestImplementation(libs.hilt.android.testing)
61-
androidTestImplementation(project(":core:testing"))
62-
kspAndroidTest(libs.hilt.compiler)
6363
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
<application>
5+
<provider
6+
android:name="androidx.startup.InitializationProvider"
7+
android:authorities="${applicationId}.androidx-startup"
8+
android:exported="false"
9+
tools:node="merge">
10+
<!-- Remove Firebase App Initialization for tests -->
11+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppInitializer"
12+
tools:node="remove" />
13+
<!-- Remove Other Firebase Initializers for tests -->
14+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppCheckInitializer"
15+
tools:node="remove" />
16+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseRemoteConfigInitializer"
17+
tools:node="remove" />
18+
</provider>
19+
</application>
20+
</manifest>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
<application>
5+
<provider
6+
android:name="androidx.startup.InitializationProvider"
7+
android:authorities="${applicationId}.androidx-startup"
8+
android:exported="false"
9+
tools:node="merge">
10+
<!-- Remove Firebase App Initialization for tests -->
11+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppInitializer"
12+
tools:node="remove" />
13+
<!-- Remove Other Firebase Initializers for tests -->
14+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppCheckInitializer"
15+
tools:node="remove" />
16+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseRemoteConfigInitializer"
17+
tools:node="remove" />
18+
</provider>
19+
</application>
20+
</manifest>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
<application>
5+
<provider
6+
android:name="androidx.startup.InitializationProvider"
7+
android:authorities="${applicationId}.androidx-startup"
8+
android:exported="false"
9+
tools:node="merge">
10+
<!-- Remove Firebase App Initialization for tests -->
11+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppInitializer"
12+
tools:node="remove" />
13+
<!-- Remove Other Firebase Initializers for tests -->
14+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppCheckInitializer"
15+
tools:node="remove" />
16+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseRemoteConfigInitializer"
17+
tools:node="remove" />
18+
</provider>
19+
</application>
20+
</manifest>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
<application>
5+
<provider
6+
android:name="androidx.startup.InitializationProvider"
7+
android:authorities="${applicationId}.androidx-startup"
8+
android:exported="false"
9+
tools:node="merge">
10+
<!-- Remove Firebase App Initialization for tests -->
11+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppInitializer"
12+
tools:node="remove" />
13+
<!-- Remove Other Firebase Initializers for tests -->
14+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseAppCheckInitializer"
15+
tools:node="remove" />
16+
<meta-data android:name="com.android.developers.androidify.startup.FirebaseRemoteConfigInitializer"
17+
tools:node="remove" />
18+
</provider>
19+
</application>
20+
</manifest>

0 commit comments

Comments
 (0)