PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version anymore, jacoco disabled for now

Browse source
This commit is contained in:
Dominik Schürmann 2014-12-04 19:42:30 +01:00
parent 450ac161b9
commit 8f5295f2d1
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
OpenKeychain-Test/build.gradle
View file

@ -1,14 +1,11 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() jcenter()
// need this for com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT below (0.9.3 in repos doesn't work!)
// run ./install-custom-gradle-test-plugin.sh to pull the thing into the local repository
mavenLocal()
} }
dependencies { dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
classpath 'com.novoda:gradle-android-test-plugin:0.9.9-SNAPSHOT' classpath 'com.novoda:gradle-android-test-plugin:0.10.0'
} }
} }
@ -50,28 +47,30 @@ android {
projectUnderTest ':OpenKeychain' projectUnderTest ':OpenKeychain'
} }
jacoco { //jacoco {
toolVersion = "0.7.0.201403182114" // //toolVersion = "0.7.0.201403182114"
} // toolVersion = "0.7.2.201409121644"
//}
//
//
//coverageSourceDirs = [
// '../OpenKeychain/src/main/java',
// '../OpenKeychain/src/gen',
// '../OpenKeychain/build/source/apt/debug',
// '../OpenKeychain/build/source/generated/buildConfig/debug',
// '../OpenKeychain/build/source/generated/r/debug'
// ]
coverageSourceDirs = [ //jacocoTestReport {
'../OpenKeychain/src/main/java', // reports {
'../OpenKeychain/src/gen', // xml.enabled = true
'../OpenKeychain/build/source/apt/debug', // html.destination "${buildDir}/jacocoHtml"
'../OpenKeychain/build/source/generated/buildConfig/debug', // }
'../OpenKeychain/build/source/generated/r/debug' // // class R is used, but usage will not be covered, so ignore this class from report
] // classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
// additionalSourceDirs = files(coverageSourceDirs)
jacocoTestReport { // executionData = files('build/jacoco/testDebug.exec')
reports { //}
xml.enabled = true
html.destination "${buildDir}/jacocoHtml"
}
// class R is used, but usage will not be covered, so ignore this class from report
classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
additionalSourceDirs = files(coverageSourceDirs)
executionData = files('build/jacoco/testDebug.exec')
}
// new workaround to force add custom output dirs for android studio // new workaround to force add custom output dirs for android studio
task addTest { task addTest {

20
prepare-tests.sh
View file

@ -10,16 +10,16 @@ if ! java -version 2>&1 | grep OpenJDK; then
return return
fi fi
tmpdir="$(mktemp -d)" #tmpdir="$(mktemp -d)"
( #(
cd "$tmpdir"; # cd "$tmpdir";
git clone https://github.com/nenick/gradle-android-test-plugin.git # git clone https://github.com/nenick/gradle-android-test-plugin.git
cd gradle-android-test-plugin # cd gradle-android-test-plugin
echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle # echo "rootProject.name = 'gradle-android-test-plugin-parent'" > settings.gradle
echo "include ':gradle-android-test-plugin'" >> settings.gradle # echo "include ':gradle-android-test-plugin'" >> settings.gradle
./gradlew :gradle-android-test-plugin:install # ./gradlew :gradle-android-test-plugin:install
) #)
rm -rf "$tmpdir" #rm -rf "$tmpdir"
echo -n "ok, adding tests to include list.. " echo -n "ok, adding tests to include list.. "
if grep OpenKeychain-Test settings.gradle >/dev/null ; then if grep OpenKeychain-Test settings.gradle >/dev/null ; then