diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a9e5c3..c38b51e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: run: | ./gradlew assemble - - name: Genrate Source jar + - name: Generate Source jar run: | ./gradlew androidSourcesJar diff --git a/lib/build.gradle b/lib/build.gradle index fdcaee7..9085db2 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -279,9 +279,21 @@ task renameLibkiwixSoFile(type: Copy) { } } +task compileTestFile(type: Exec) { + workingDir "${projectDir}/src/test/" + commandLine 'javac', '-g', '-d', '.', '-s', '.', '-cp', 'junit-4.13.jar:' + buildDir.path +'/libs/*', 'test.java' +} + +task runTests(type: Exec) { + workingDir "${projectDir}/src/test/" + dependsOn compileTestFile + commandLine 'java', '-Djava.library.path=' + buildDir.path, '-javaagent:jacoco-0.8.7/lib/jacocoagent.jar', '-cp', 'junit-4.13.jar:hamcrest-core-1.3.jar:' + buildDir.path +'/libs/*lib*.jar' + ':.', 'org.junit.runner.JUnitCore', 'test' +} + task createCodeCoverageReport(type: Exec) { workingDir "${projectDir}/src/test/" - commandLine 'sh', '-c', "bash 'run_test.sh' ${buildDir}/libs/*lib*.jar $buildDir" + dependsOn runTests + commandLine 'java', '-jar', 'jacoco-0.8.7/lib/jacococli.jar', 'report', 'jacoco.exec', '--classfiles', 'org/kiwix/libkiwix/', '--classfiles', 'org/kiwix/libzim/', '--html', '../../build/coverage-report', '--xml', 'coverage.xml' } task checkCurrentJavaVersion() { diff --git a/lib/src/test/run_test.sh b/lib/src/test/run_test.sh deleted file mode 100755 index 141c822..0000000 --- a/lib/src/test/run_test.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/bash - -# This script runs the unit test to test the java wrapper. -# This is not integrated in meson because ... this is not so easy. - -die() -{ - echo >&2 "!!! ERROR: $*" - exit 1 -} - -KIWIX_LIB_JAR=$(readlink -f "$1") -KIWIX_LIB_DIR=$(readlink -f "$2") -TEST_SOURCE_DIR=$(dirname "$(readlink -f $0)") - -cd "$TEST_SOURCE_DIR" - -javac -g -d . -s . -cp "junit-4.13.jar:$KIWIX_LIB_JAR" test.java \ - || die "Compilation failed" - -java -Djava.library.path="$KIWIX_LIB_DIR" \ - -javaagent:jacoco-0.8.7/lib/jacocoagent.jar -cp "junit-4.13.jar:hamcrest-core-1.3.jar:$KIWIX_LIB_JAR:." \ - org.junit.runner.JUnitCore test \ - || die "Unit test failed" - -java -jar jacoco-0.8.7/lib/jacococli.jar report jacoco.exec \ ---classfiles org/kiwix/libkiwix/ \ ---classfiles org/kiwix/libzim/ \ ---html ../../build/coverage-report --xml coverage.xml \ No newline at end of file