Added lib tests, included jvm tests for android

Author: compscidr

.github/workflows/test.yml

@@ -35,8 +35,10 @@ jobs:
         uses: yutailang0119/action-android-lint@v3.1.0
         with:
           report-path: app/build/reports/lint/report.xml
-      - name: Jvm Unit Tests with Coverage Report
-        run: ./gradlew jacocoTestReportDebug
+      - name: app Jvm Unit Tests with Coverage Report
+        run: ./gradlew jacocoTestReportUnitTests
+      - name: lib Jvm Unit Tests with Coverage Report
+        run: ./gradlew lib:test
       - name: Clean Packages
         run: bash ./scripts/clean-packages.sh
       - name: On-Device Instrumented Tests
@@ -60,7 +62,10 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests
-          files: ./app/build/reports/jacoco/jacocoTestReportDebug/jacocoTestReportDebug.xml
+          files: |
+            ./app/build/reports/coverage/androidTest/debug/connected/report.xml
+            ./app/build/reports/jacoco/jacocoTestReportDebugUnitTest/jacocoTestReportDebugUnitTest.xml
+            ./lib/build/reports/jacoco/test/jacocoTestReport.xml
 
       - name: Upload Instrumented Tests Report to CodeCov
         # https://github.com/codecov/codecov-action

app/build.gradle

@@ -31,8 +31,8 @@ android {
 
     // 3) Java 8 is required
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     packagingOptions {
         jniLibs {
@@ -54,6 +54,7 @@ android {
             shrinkResources false
             minifyEnabled false
             testCoverageEnabled true
+            enableUnitTestCoverage true
         }
     }
 
@@ -104,6 +105,9 @@ android {
             }
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -151,10 +155,8 @@ jacoco {
     toolVersion = '0.8.11'
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = "11"
-    }
+kotlin {
+    jvmToolchain(17)
 }
 
 // https://github.com/ReactiveCircus/app-versioning
@@ -168,5 +170,29 @@ appVersioning {
     }
 }
 
+// for some rason running the jacocoTestReport generates a report for the release unit tests that
+// works with jacoco, however it doesn't add it to the
+tasks.create(name: "jacocoTestReportUnitTests", type: JacocoReport, dependsOn: "jacocoTestReport") {
+    group = "Reporting" // existing group containing tasks for generating linting reports etc.
+    description = "Generate JVM unit test coverage reports using Jacoco."
+
+    reports {
+        // human readable (written into './build/reports/jacoco/unitTestCoverageReport/html')
+        html.required = true
+        // CI-readable (written into './build/reports/jacoco/unitTestCoverageReport/unitTestCoverageReport.xml')
+        xml.required = true
+    }
+
+    // Execution data generated when running the tests against classes instrumented by the JaCoCo agent.
+    // This is enabled with 'enableUnitTestCoverage' in the 'debug' build type.
+    executionData.from = fileTree(dir: "${project.buildDir}/jacoco/", includes: ["/testReleaseUnitTest.exec"])
+
+    // Compiled Kotlin class files are written into build-variant-specific subdirectories of 'build/tmp/kotlin-classes'.
+    classDirectories.from = "${project.buildDir}/tmp/kotlin-classes/release"
+
+    // To produce an accurate report, the bytecode is mapped back to the original source code.
+    sourceDirectories.from = "${project.projectDir}/src/main/java"
+}
+
 apply from: file('secrets.gradle')
 apply from: file('publish.gradle')

gradle.properties

@@ -19,6 +19,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false

lib/build.gradle

@@ -1,26 +1,39 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id 'java-library'
     id 'org.jetbrains.kotlin.jvm'
+    id 'jacoco'
 }
 
-compileJava   {
-    sourceCompatibility = '11'
-    targetCompatibility = '11'
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+kotlin {
+    jvmToolchain(17)
+}
+
+jacoco {
+    toolVersion = "0.8.11"
 }
 
-tasks.withType(KotlinCompile).configureEach {
-    kotlinOptions {
-        jvmTarget = "11"
+jacocoTestReport {
+    reports {
+        xml.required = true
+        html.required = true
     }
 }
 
+test {
+    useJUnitPlatform()
+    finalizedBy jacocoTestReport
+}
+
 dependencies {
     implementation "org.slf4j:slf4j-api:${slf4j_version}"
+
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$kotlin_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:$jupiter_version"
+    testImplementation "org.slf4j:slf4j-simple:${slf4j_version}"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.10.1"
 }

lib/src/test/kotlin/com/example/lib/MyClassTest.kt

@@ -0,0 +1,11 @@
+package com.example.lib
+
+import org.junit.jupiter.api.Test
+
+class MyClassTest {
+    @Test
+    fun testMyClass() {
+        val myClass = MyClass()
+        myClass.display()
+    }
+}