From 524f1a28cc9df5c945ade32c3eb317acb17cd0b1 Mon Sep 17 00:00:00 2001 From: Sven Frese Date: Wed, 7 Nov 2018 10:44:42 +0100 Subject: [PATCH 1/3] refactor: experimental codecov integration --- .circleci/config.yml | 8 ++++++-- build.gradle | 10 ++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76c1f0c..a6f5a12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-dependencies- - - run: gradle dependencies + - run: ./gradlew dependencies - save_cache: paths: @@ -39,4 +39,8 @@ jobs: key: v1-dependencies-{{ checksum "build.gradle" }} # run tests! - - run: gradle test + - run: ./gradlew clean check jacocoTestReport + + # upload code coverage report + # ultimately code coverage token shouldn't be in ci script of course + - run: bash <(curl -s https://codecov.io/bash) -t 5e7cd734-0897-43b4-9963-f4710f21ec64 diff --git a/build.gradle b/build.gradle index 642a8c3..0995340 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,15 @@ project.ext { version = '3.5.0-SNAPSHOT' +// code coverage configuration +apply plugin: 'jacoco' +jacocoTestReport { + reports { + xml.enabled true + html.enabled false + } +} + /* * Dependencies */ @@ -341,3 +350,4 @@ tasks.withType(CreateStartScripts).each { task -> task wrapper(type: Wrapper) { gradleVersion = '2.14' } + From 5a30473af965144b0b33d45868146440af1a619e Mon Sep 17 00:00:00 2001 From: Sven Frese Date: Wed, 7 Nov 2018 13:16:52 +0100 Subject: [PATCH 2/3] refactor: delete tests to check updated codecov report --- .../halecli/data/RewriteCommandTest.groovy | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/src/test/groovy/to/wetransform/halecli/data/RewriteCommandTest.groovy b/src/test/groovy/to/wetransform/halecli/data/RewriteCommandTest.groovy index 00642c4..fcececa 100644 --- a/src/test/groovy/to/wetransform/halecli/data/RewriteCommandTest.groovy +++ b/src/test/groovy/to/wetransform/halecli/data/RewriteCommandTest.groovy @@ -77,66 +77,4 @@ class RewriteCommandTest { } } - @Test - void testRewriteGuessSchema() { - - def args = ['data', 'rewrite']; - - args << '--data' - args << getClass().getClassLoader().getResource("testdata/inspire.gml") - - def targetFile = File.createTempFile('rewrite', '.gml') - args << '--target' - args << targetFile.absolutePath - args << '--target-writer' - args << 'eu.esdihumboldt.hale.io.gml.writer' - args << '--target-setting' - args << 'xml.pretty=true' - - try { - int code = new Runner('hale').run(args as String[]) - - // expecting a successful execution - assertEquals(0, code) - - assertTrue(targetFile.exists()) - assertTrue(targetFile.size() > 0) - //TODO check file content? - - } finally { - targetFile.delete() - } - } - - @Test - void testRewriteNoPassthrough() { - - def args = ['data', 'rewrite']; - - args << '--data' - args << getClass().getClassLoader().getResource("testdata/inspire.gml") - - def targetFile = File.createTempFile('rewrite', '.gml') - args << '--target' - args << targetFile.absolutePath - args << '--target-writer' - args << 'eu.esdihumboldt.hale.io.wfs.fc.write-2.0' - args << '--target-setting' - args << 'skipFeatureCount=false' - - try { - int code = new Runner('hale').run(args as String[]) - - // expecting a successful execution - assertEquals(0, code) - - assertTrue(targetFile.exists()) - assertTrue(targetFile.size() > 0) - //TODO check file content? - - } finally { - targetFile.delete() - } - } - } From f1ad0647063d7d43a00ed70f90bd655c6fb938e3 Mon Sep 17 00:00:00 2001 From: Sven Frese Date: Wed, 7 Nov 2018 14:52:35 +0100 Subject: [PATCH 3/3] refactor: test adding codecov file --- .circleci/config.yml | 16 +--------------- .codecov | 5 +++++ README.md | 1 + 3 files changed, 7 insertions(+), 15 deletions(-) create mode 100644 .codecov diff --git a/.circleci/config.yml b/.circleci/config.yml index a6f5a12..ed1633d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,22 +23,8 @@ jobs: steps: - checkout - - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "build.gradle" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - - run: ./gradlew dependencies - - - save_cache: - paths: - - ~/.gradle - key: v1-dependencies-{{ checksum "build.gradle" }} - # run tests! + # run tests and generate coverage report - run: ./gradlew clean check jacocoTestReport # upload code coverage report diff --git a/.codecov b/.codecov new file mode 100644 index 0000000..29bec42 --- /dev/null +++ b/.codecov @@ -0,0 +1,5 @@ +coverage: + status: + project: + default: + threshold: 0.5 \ No newline at end of file diff --git a/README.md b/README.md index 9473662..9759e64 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ hale-cli [![Build Status](https://builds.wetransform.to/buildStatus/icon?job=hale/hale-cli~publish)](https://builds.wetransform.to/job/hale/job/hale-cli~publish) [![Docker Hub Badge](https://img.shields.io/badge/Docker-Hub%20Hosted-blue.svg)](https://hub.docker.com/r/wetransform/hale-cli/) +[![codecov.io](http://codecov.io/github/sfrese/hale-cli/coverage.svg?branch=devel)](http://codecov.io/github/sfrese/hale-cli?branch=devel) hale command line interface. Lists available commands when run without arguments.