-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed lookup for tests if unit tests are disabled in Android config
Fixes #405 A small refactoring of DynamicBean was also carried out
- Loading branch information
Showing
30 changed files
with
350 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...ionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/AndroidConfigsTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package kotlinx.kover.gradle.plugin.test.functional.cases | ||
|
|
||
| import kotlinx.kover.gradle.plugin.test.functional.framework.checker.CheckerContext | ||
| import kotlinx.kover.gradle.plugin.test.functional.framework.starter.TemplateTest | ||
|
|
||
| internal class AndroidConfigsTests { | ||
| @TemplateTest("disabledUnitTests", [":app:koverXmlReportDebug"]) | ||
| fun CheckerContext.testUnitTestsAreDisabledInAgp() { | ||
| subproject(":app") { | ||
| taskNotCalled("testDebugUnitTest") | ||
| checkOutcome("koverXmlReportDebug", "SUCCESS") | ||
| xmlReport("debug") { | ||
| classCounter("kotlinx.kover.test.android.Maths").assertFullyMissed() | ||
| } | ||
| } | ||
| } | ||
| } |
5 changes: 2 additions & 3 deletions
5
...lTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/CompilationFiltersTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...-gradle-plugin/src/functionalTest/templates/builds/disabledUnitTests/app/build.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| plugins { | ||
| id ("com.android.application") | ||
| id ("org.jetbrains.kotlin.android") | ||
| id ("org.jetbrains.kotlinx.kover") | ||
| } | ||
|
|
||
| android { | ||
| namespace = "kotlinx.kover.test.android" | ||
| compileSdk = 32 | ||
|
|
||
| defaultConfig { | ||
| applicationId = "kotlinx.kover.test.android" | ||
| minSdk = 21 | ||
| targetSdk = 31 | ||
| versionCode = 1 | ||
| versionName = "1.0" | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = true | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
| kotlinOptions { | ||
| jvmTarget = "1.8" | ||
| } | ||
| buildFeatures { | ||
| viewBinding = true | ||
| } | ||
| } | ||
|
|
||
| androidComponents { | ||
| beforeVariants { variant -> | ||
| variant.enableUnitTest = false | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("androidx.core:core-ktx:1.8.0") | ||
| implementation("androidx.appcompat:appcompat:1.5.0") | ||
| implementation("com.google.android.material:material:1.6.1") | ||
| implementation("androidx.constraintlayout:constraintlayout:2.1.4") | ||
| testImplementation("junit:junit:4.13.2") | ||
| } | ||
|
|
||
| koverReport { | ||
| // filters for all report types of all build variants | ||
| filters { | ||
| excludes { | ||
| classes( | ||
| "*Fragment", | ||
| "*Fragment\$*", | ||
| "*Activity", | ||
| "*Activity\$*", | ||
| "*.databinding.*", | ||
| "*.BuildConfig" | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| androidReports("release") { | ||
| // filters for all report types only of 'release' build type | ||
| filters { | ||
| excludes { | ||
| classes( | ||
| "*Fragment", | ||
| "*Fragment\$*", | ||
| "*Activity", | ||
| "*Activity\$*", | ||
| "*.databinding.*", | ||
| "*.BuildConfig", | ||
|
|
||
| // excludes debug classes | ||
| "*.DebugUtil" | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
24 changes: 24 additions & 0 deletions
24
...in/src/functionalTest/templates/builds/disabledUnitTests/app/src/main/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
|
||
| <application android:label="@string/app_name"> | ||
| <uses-library android:name="com.google.android.things" android:required="false" /> | ||
|
|
||
| <activity android:name=".MainActivity" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| <!-- Make this the first activity that is displayed when the device boots. --> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.HOME" /> | ||
| <category android:name="android.intent.category.DEFAULT" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
|
|
||
| </manifest> |
7 changes: 7 additions & 0 deletions
7
...plates/builds/disabledUnitTests/app/src/main/java/kotlinx/kover/test/android/DebugUtil.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package kotlinx.kover.test.android | ||
|
|
||
| object DebugUtil { | ||
| fun log(message: String) { | ||
| println("DEBUG: $message") | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13
...tes/builds/disabledUnitTests/app/src/main/java/kotlinx/kover/test/android/MainActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package kotlinx.kover.test.android | ||
|
|
||
| import android.os.Bundle | ||
| import android.app.Activity | ||
|
|
||
| class MainActivity : Activity() { | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContentView(R.layout.activity_main) | ||
| } | ||
|
|
||
| } |
13 changes: 13 additions & 0 deletions
13
.../templates/builds/disabledUnitTests/app/src/main/java/kotlinx/kover/test/android/Maths.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package kotlinx.kover.test.android | ||
|
|
||
| object Maths { | ||
| fun sum(a: Int, b: Int): Int { | ||
| DebugUtil.log("invoked sum") | ||
| return a + b | ||
| } | ||
|
|
||
| fun sub(a: Int, b: Int): Int { | ||
| DebugUtil.log("invoked sub") | ||
| return a - b | ||
| } | ||
| } |
Oops, something went wrong.