From 6a588e449ef8d73077bf901be79b023598639d6f Mon Sep 17 00:00:00 2001
From: Melih Aksoy <m.aksoy@tmg.nl>
Date: Wed, 3 Jul 2019 14:05:20 +0200
Subject: [PATCH] Run tests on CI

---
 .circleci/config.yml                | 17 +++++++++++++++--
 fastlane/Fastfile                   |  2 +-
 scripts/default_dependencies.gradle |  3 +++
 scripts/sources.gradle              |  4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb50d2b..11b3e90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,15 +14,28 @@ jobs:
       #         name: Chmod permissions #if permission for Gradlew Dependencies fail, use this.
       #         command: sudo chmod +x ./gradlew
       - run:
-          name: Install bundle
+          name: Setup
           command: |
             gem install bundler
             bundle install
+            mkdir ~/code/reports
+
+      # Detekt
       - run:
           name: Detekt
           command: fastlane detekt
       - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
           path: reports/detekt
       - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
-          path: reports/tests
+          path: reports
+
+      # Tests
+      - run:
+          name: Tests
+          command: fastlane test_all
+      - store_artifacts: # for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
+          path: build/reports/tests
+      - store_test_results: # for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
+          path: reports
+
       # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 620d759..d30e454 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -46,6 +46,6 @@ platform :android do
   end
 
   def run_all_tests
-    gradle(task: "test --continue")
+    gradle(task: "clean test --continue")
   end
 end
diff --git a/scripts/default_dependencies.gradle b/scripts/default_dependencies.gradle
index e5c9685..a6ae4c6 100644
--- a/scripts/default_dependencies.gradle
+++ b/scripts/default_dependencies.gradle
@@ -1,3 +1,4 @@
+apply plugin: "de.mannodermaus.android-junit5"
 apply from: "$rootProject.projectDir/scripts/detekt.gradle"
 apply from: "$rootProject.projectDir/scripts/dokka.gradle"
 
@@ -13,4 +14,6 @@ dependencies {
     testImplementation testLibraries.jUnitApi
     testImplementation testLibraries.mockk
     testImplementation testLibraries.kluent
+
+    testRuntimeOnly testLibraries.jUnitEngine
 }
diff --git a/scripts/sources.gradle b/scripts/sources.gradle
index e44f000..d6a4f00 100644
--- a/scripts/sources.gradle
+++ b/scripts/sources.gradle
@@ -9,4 +9,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }