diff --git a/.travis.yml b/.travis.yml
index 41181c18..c23f3dcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,13 @@ android:
# The SDK version used to compile your project
- android-29
# The SDK version used by the system image
- - android-22
+ - android-23
# The system image, to run an emulator during the tests
- - sys-img-armeabi-v7a-android-22
+ - sys-img-armeabi-v7a-android-23
before_script:
# Emulator Management: Create, Start and Wait
- - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- - emulator -avd test -no-audio -no-window &
+ - echo no | android create avd --force -n test -t android-23 --abi armeabi-v7a
+ - export QEMU_AUDIO_DRV=none && emulator -avd test -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82
# This should be in the `before_script` entry
diff --git a/app/build.gradle b/app/build.gradle
index 3ff8eb34..d52bd54f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,15 @@
apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'jacoco'
android {
compileSdkVersion 29
buildToolsVersion "29.0.3"
defaultConfig {
- applicationId "ch.epfl.sdp"
- minSdkVersion 21
+ applicationId "com.h.pixeldroid"
+ minSdkVersion 23
targetSdkVersion 29
versionCode 1
versionName "1.0"
@@ -15,6 +18,9 @@ android {
}
buildTypes {
+ debug {
+ testCoverageEnabled true
+ }
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -25,10 +31,36 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- testImplementation 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
+
+
+tasks.withType(Test) {
+ jacoco.includeNoLocationClasses = true
+ jacoco.excludes = ['jdk.internal.*']
+}
+
+task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {
+
+ reports {
+ xml.enabled = true
+ html.enabled = true
+ }
+
+ def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
+ def debugTree = fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: fileFilter)
+ def kotlinDebugTree = fileTree(dir: "$project.buildDir/tmp/kotlin-classes/debug", excludes: fileFilter)
+ def javaMainSrc = "$project.projectDir/src/main/java"
+ def kotlinMainSrc = "$project.projectDir/src/main/kotlin"
+ sourceDirectories = files([javaMainSrc, kotlinMainSrc])
+ classDirectories = files([debugTree, kotlinDebugTree])
+ executionData = fileTree(dir: project.buildDir, includes: [
+ 'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec'
+ ])
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/epfl/sdp/ExampleInstrumentedTest.java b/app/src/androidTest/java/ch/epfl/sdp/ExampleInstrumentedTest.java
deleted file mode 100644
index ac4de81a..00000000
--- a/app/src/androidTest/java/ch/epfl/sdp/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package ch.epfl.sdp;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see Testing documentation
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
- @Test
- public void useAppContext() {
- // Context of the app under test.
- Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
- assertEquals("ch.epfl.sdp", appContext.getPackageName());
- }
-}
diff --git a/app/src/androidTest/java/com/h/pixeldroid/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/h/pixeldroid/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..4f6ac769
--- /dev/null
+++ b/app/src/androidTest/java/com/h/pixeldroid/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.h.pixeldroid
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("com.h.pixeldroid", appContext.packageName)
+ }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c159ea4..95641a5b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="com.h.pixeldroid">
-
-
-
-