From a430a7d70decac06498c31f25ab2c9c0397151b9 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 10 Jan 2018 23:31:31 +0100 Subject: [PATCH 1/4] coverage --- .travis.yml | 5 ++++- README.md | 4 ++++ app/build.gradle | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6799bbf35f..52552b3ceb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,4 +15,7 @@ android: script: # Unit Test - - ./gradlew test \ No newline at end of file + - ./gradlew test jacocoTestReport + +after_success: + - bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/README.md b/README.md index b700f18b7a..638bbecf13 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,7 @@ [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build status](https://travis-ci.org/MilosKozak/AndroidAPS.svg?branch=master)](https://travis-ci.org/MilosKozak/AndroidAPS) +[![Coverage Status][coverage-img]][coverage-url] + +[coverage-img]: https://img.shields.io/coveralls//MilosKozak/AndroidAPS/dev.svg +[coverage-url]: https://coveralls.io/github//MilosKozak/AndroidAPS?branch=dev \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 207a9831df..832d0cf30f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,17 @@ buildscript { repositories { maven { url 'https://maven.fabric.io/public' } + jcenter() } dependencies { classpath 'io.fabric.tools:gradle:1.+' + classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2' } } apply plugin: 'com.android.application' apply plugin: 'io.fabric' +apply plugin: 'jacoco-android' repositories { maven { url 'https://maven.fabric.io/public' } @@ -61,6 +64,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + testCoverageEnabled true + } } productFlavors { flavorDimensions "standard" From 99eef3b19ab300d84c4d506b57e93efbe5c741a6 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 10 Jan 2018 23:57:02 +0100 Subject: [PATCH 2/4] more round tests --- app/src/test/java/info/nightscout/utils/RoundTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/test/java/info/nightscout/utils/RoundTest.java b/app/src/test/java/info/nightscout/utils/RoundTest.java index d95ab2b391..1a801d2a7d 100644 --- a/app/src/test/java/info/nightscout/utils/RoundTest.java +++ b/app/src/test/java/info/nightscout/utils/RoundTest.java @@ -14,18 +14,21 @@ public class RoundTest { public void roundToTest() throws Exception { assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000001d ); assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000001d ); + assertEquals( 0d, Round.roundTo(0d, 1d), 0.00000001d ); } @Test public void floorToTest() throws Exception { assertEquals( 0.5d, Round.floorTo(0.54d, 0.05d), 0.00000001d ); assertEquals( 1d, Round.floorTo(1.59d, 1d), 0.00000001d ); + assertEquals( 0d, Round.floorTo(0d, 1d), 0.00000001d ); } @Test public void ceilToTest() throws Exception { assertEquals( 0.6d, Round.ceilTo(0.54d, 0.1d), 0.00000001d ); assertEquals( 2d, Round.ceilTo(1.49999d, 1d), 0.00000001d ); + assertEquals( 0d, Round.ceilTo(0d, 1d), 0.00000001d ); } } \ No newline at end of file From 92642c5d0cbf4a6a10f082692da822ce64a95471 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 11 Jan 2018 10:01:33 +0100 Subject: [PATCH 3/4] update badge --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 638bbecf13..54d9bb092a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,5 @@ [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build status](https://travis-ci.org/MilosKozak/AndroidAPS.svg?branch=master)](https://travis-ci.org/MilosKozak/AndroidAPS) -[![Coverage Status][coverage-img]][coverage-url] - -[coverage-img]: https://img.shields.io/coveralls//MilosKozak/AndroidAPS/dev.svg -[coverage-url]: https://coveralls.io/github//MilosKozak/AndroidAPS?branch=dev \ No newline at end of file +[![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS) +dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS) \ No newline at end of file From 51ca0e0d121c985009330d05bf145b700f5afc1d Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Thu, 11 Jan 2018 14:14:53 +0100 Subject: [PATCH 4/4] Update build.gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 832d0cf30f..524c7af381 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,6 +58,7 @@ android { } lintOptions { disable 'MissingTranslation' + disable 'ExtraTranslation' } buildTypes { release {