Merge branch 'code-coverage'

sepgroup · Jul 26, 2016 · 0906a2f · 0906a2f
2 parents 2b5e723 + 282e9a7
commit 0906a2f
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 79 deletions.
diff --git a/.idea/modules/sep.iml b/.idea/modules/sep.iml
diff --git a/.idea/modules/sep_main.iml b/.idea/modules/sep_main.iml
diff --git a/.idea/modules/sep_package.iml b/.idea/modules/sep_package.iml
diff --git a/.idea/modules/sep_test.iml b/.idea/modules/sep_test.iml
diff --git a/.idea/runConfigurations/Gradle_Check.xml b/.idea/runConfigurations/Gradle_Check.xml
diff --git a/.idea/runConfigurations/Gradle_Clean_Run.xml b/.idea/runConfigurations/Gradle_Clean_Run.xml
diff --git a/.travis.yml b/.travis.yml
@@ -8,3 +8,11 @@ addons:
       - oracle-java8-installer
 
 install: true
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
@@ -3,7 +3,9 @@ COMP 354 Software Engineering Project
 
 ![circleci build](https://circleci.com/gh/sepgroup/sep.svg?style=shield&circle-token=d385fd0d02f477f4d43e017b70f88964b600578d)
 
-[![Travis-CI Build Status](https://travis-ci.org/sepgroup/sep.svg?branch=master)](https://travis-ci.org/sepgroup/sep)
+[![Travis](https://img.shields.io/travis/sepgroup/sep.svg?maxAge=2592000)](https://travis-ci.org/sepgroup/sep)
+
+[![Code Coverage](https://img.shields.io/codecov/c/github/sepgroup/sep/master.svg)](https://codecov.io/github/sepgroup/sep?branch=master)
 
 ## Description
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'java'
 apply from: "gradle/plugin/javafx.plugin"
+apply plugin: 'jacoco'
 
 compileJava {
     sourceCompatibility = '1.8'
@@ -37,6 +38,22 @@ test {
     }
 }
 
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+    afterEvaluate {
+        classDirectories = files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: [
+                    '**/*jfree**'
+            ])
+        })
+    }
+}
+
+check.dependsOn jacocoTestReport
+
 javafx {
     appID 'SEP'
     appName 'Software Engineering Project'

diff --git a/circle.yml b/circle.yml
@@ -7,3 +7,5 @@ test:
   post:
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
     - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+    - bash <(curl -s https://codecov.io/bash)
+