From 0b3317600bf7641425cfacb9709333c11a897414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 16 Jun 2015 00:08:17 +0200 Subject: Cleanup in build.gradle --- OpenKeychain/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 3c239d44b..511183d10 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -40,7 +40,7 @@ dependencies { compile 'com.jpardogo.materialtabstrip:library:1.0.9' compile 'com.getbase:floatingactionbutton:1.9.0' compile 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0' - compile "com.splitwise:tokenautocomplete:1.3.3@aar" + compile 'com.splitwise:tokenautocomplete:1.3.3@aar' compile 'se.emilsjolander:stickylistheaders:2.6.0' compile 'org.sufficientlysecure:html-textview:1.1' compile 'com.mikepenz.materialdrawer:library:2.8.2@aar' -- cgit v1.2.3 From 5e4842ab64733fbf07e32af0e6c5f21fad743874 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 13 Jun 2015 21:50:57 +0200 Subject: fix instrumentation test(s) --- OpenKeychain/build.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 511183d10..b640e7ebe 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -21,10 +21,14 @@ dependencies { testCompile 'org.robolectric:robolectric:3.0-rc3' // UI testing with Espresso - androidTestCompile 'com.android.support.test:runner:0.2' - androidTestCompile 'com.android.support.test:rules:0.2' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.1' - androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.1' + androidTestCompile 'com.android.support.test:runner:0.3' + androidTestCompile 'com.android.support.test:rules:0.3' + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2' + androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2') { + exclude group: 'com.android.support', module: 'appcompat' + exclude group: 'com.android.support', module: 'support-v4' + exclude module: 'recyclerview-v7' + } // Temporary workaround for bug: https://code.google.com/p/android-test-kit/issues/detail?id=136 // from https://github.com/googlesamples/android-testing/blob/master/build.gradle#L21 -- cgit v1.2.3 From 442aed8a2d2c26b45e294fdaf8b4a5b6b72cdf14 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 14 Jun 2015 12:12:28 +0200 Subject: update instrumentation test to JUnit4 --- OpenKeychain/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index b640e7ebe..ca1c30d40 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -143,9 +143,8 @@ android { // Reference them in .xml files. resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" - // Disabled: only works for androidTest not test! // Enable code coverage (Jacoco) - //testCoverageEnabled true + testCoverageEnabled true } } -- cgit v1.2.3 From 6f47c78981efd8e135e3e3cf2b5818bfd17970d4 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 14 Jun 2015 15:05:47 +0200 Subject: stash away stuff --- OpenKeychain/build.gradle | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index ca1c30d40..f85678b67 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -197,6 +197,8 @@ android { } } +// apply plugin: 'spoon' + task jacocoTestReport(type:JacocoReport) { group = "Reporting" description = "Generate Jacoco coverage reports" -- cgit v1.2.3 From 8e60ccb650ba4af516687558fe365540a92a1630 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 17 Jun 2015 04:27:03 +0200 Subject: workaround for coverage bug (for now!) see android bug report https://code.google.com/p/android/issues/detail?id=170607 --- OpenKeychain/build.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index f85678b67..491926a4e 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -114,7 +114,7 @@ android { versionCode 32300 versionName "3.2.3" applicationId "org.sufficientlysecure.keychain" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "org.sufficientlysecure.keychain.JacocoWorkaroundJUnitRunner" } compileOptions { @@ -217,7 +217,10 @@ task jacocoTestReport(type:JacocoReport) { "${buildDir}/generated/source/buildConfig/debug", "${buildDir}/generated/source/r/debug" ]) - executionData = files("${buildDir}/jacoco/testDebug.exec") + executionData = files([ + "${buildDir}/jacoco/testDebug.exec", + "${buildDir}/outputs/code-coverage/connected/coverage.ec" + ]) reports { xml.enabled = true -- cgit v1.2.3 From 04d2b6a5076a1a7264687999152f8c24ece773ab Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 17 Jun 2015 18:30:58 +0200 Subject: use regular runner for most cases --- OpenKeychain/build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 491926a4e..e2d1dd8c8 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -114,7 +114,13 @@ android { versionCode 32300 versionName "3.2.3" applicationId "org.sufficientlysecure.keychain" - testInstrumentationRunner "org.sufficientlysecure.keychain.JacocoWorkaroundJUnitRunner" + // the androidjunitrunner is broken regarding coverage, see here: + // https://code.google.com/p/android/issues/detail?id=170607 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + // this workaround runner fixes the coverage problem, BUT doesn't work + // with android studio single test execution. use it to generate coverage + // data, but keep the other one otherwis + // testInstrumentationRunner "org.sufficientlysecure.keychain.JacocoWorkaroundJUnitRunner" } compileOptions { -- cgit v1.2.3