Merge pull request #1 from guhungry/add-code-coverage-to-androidTest

chore: Add code coverage to android test

Author: guhungry

.travis.yml

@@ -12,12 +12,25 @@ jdk:
 # as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
 sudo: false
 
-before_install:
-  # Install SDK license so Android Gradle plugin can install deps.
-  - mkdir "$ANDROID_HOME/licenses" || true
-  - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" >> "$ANDROID_HOME/licenses/android-sdk-license"
-  - yes | sdkmanager "platforms;android-18"
+licenses:
+    - 'android-sdk-preview-license-.+'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+
+install:
+  - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid harmless sdkmanager warning
+  - echo y | sdkmanager "platform-tools" >/dev/null
+  - echo y | sdkmanager "tools" >/dev/null # A second time per Travis docs, gets latest versions
+  - echo y | sdkmanager "build-tools;28.0.3" >/dev/null # Implicit gradle dependency - gradle drives changes
+  - echo y | sdkmanager "platforms;android-26" >/dev/null # We need the API of the emulator we will run
+  - echo y | sdkmanager "platforms;android-28" >/dev/null # We need the API of the current compileSdkVersion from gradle.properties
+  - echo y | sdkmanager --channel=4 "emulator" >/dev/null # Use canary channel to get emulator 29.x for x86_64 image support
+  - echo y | sdkmanager "extras;android;m2repository" >/dev/null
+  - echo y | sdkmanager "system-images;android-26;default;x86_64" >/dev/null # install our emulator
+  - echo no | avdmanager create avd --force -n test -k "system-images;android-26;default;x86_64" -c 10M
+  - emulator -verbose -avd test -no-accel -no-snapshot -no-window $AUDIO -camera-back none -camera-front none -selinux permissive -qemu -m 2048 &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 
 # script for build and release via Travis to Bintray
 script: gradle/buildViaTravis.sh
@@ -33,9 +46,16 @@ cache:
   directories:
   - $HOME/.m2
   - $HOME/.gradle
+  # Android SDK
+  - /usr/local/android-sdk
 
 env:
   global:
+  - ANDROID_HOME=/usr/local/android-sdk
+  - ANDROID_SDK_ROOT=/usr/local/android-sdk
+  - TOOLS=${ANDROID_HOME}/tools
+  - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
+  - QEMU_AUDIO_DRV=none
   - secure: oUlPXht69hzfb3N9eMdw39P6KYNrMM2YIXcZlsvBRowQNxtE3TTkGEP3DIbBCxpJyokWc7zazmMAy19Z2TngPpDDeaR8f1hBG6R/J/O4ZOCpfWoR5U4wB8qTnc0HBy8atqMWq5dzLhP4N1vsOXtyJ/JBJwMkDMytm6j2QYrDxyLZKA7A/6jEFI5BtFVqenwHQC1T0bpYLC9aaOgannnAKffKpYY2WVhqj4X72iuuf8eRQQBCTzKmhhqluJOWwRPJL7IuUIzkcIIHyGUUz+KsN05vYL9DOR1NokWP+oEFMHw5XavW7h0DM5iKVW4JMqVJm1bSpxkC3Dngxo9IbnWVk4xn5G80gDlviaMy8ukUMwxF846yd4dskbjV2t/wdec9G4NNUlX7a9HlSfBJ9sAW8WOd1sn9z2HbOKgwt5wkkTWzKGMU0dKhmN6WElrzuLUNsof/NW8d3NhM9MSB3vkn4avFOERbjMpx5kayW/HQA19iwq/vh2f5olIidME//iCzfu6qRu4OmMH50kO797Gn6qKMZmf68wxUxOqeLTj+LnF7Y3ERaGMFbZ0qu4F5PsO6Yt6mx8m52n+e1qrdX7BqtpGgexQEvuc6nQJGmAPIezCYepK18/six6F/QstykEJpAKee/F2RIkd7wfGBHIFFXxbvXluYW537GFuFuEZRYlw=
   - secure: ehd0VTpDn0ehomVYewJn1TiMa1aMhfZ2oRnNnxMNS1GjCBRkKTne++wbe91iPp4TeD/e7WcdFJRKZlW8oFk/bPoJZeyru1uIj1lBa7hmhA706wcrnFyLAeJt2Uzko3ZTzQm2ERaSek4UbXhDqaYIWxDoAuOntIXyF4ojU++PSkubV+T9X/HPBgCd6BE8nC4XXhIdLbwdTvatRrPezgcAQy9yAQnAlAbSaoyjYln2bRsf8fup97hBaUM0TtQuQ8uOWq/4fxQBzreqHsxxkiOA1EbogCAY4ZruauBorjkdU5qokI4SYKry7L1paaxQlM6DHsZuQI3kMuqN8kmZsYbQM/ryMpICXa6OswCiCnVrd7pQ1qouRolpXJmNiOHBe10j1LqnzkfFoz85dTou5/boHa5GVYCQM+sNhsbEpa3yMCQ2rSpPr86xCj14bgZAs+MZ6YArB1ZK/1wKjyUVOyEddStgamiXLEe3rdq3+00o9aiGDVaa6uq9cdm6doh0AP460b4zx1+ocZH5A3PSiOO+DTSn1sZasqOrUvJgzJcCLL7o5Y7BVP4d6Vk2YtbukOBNgB6mh2rCeh1mro7rhy9iwBX6BUN9CwxPyxNPwu0+KwWFQ+UsbJD4FatWnScXlWkTeXrK3M/PUAno+jrD5fydMtv1V0dbTdW70PXZNtEnVdE=
   - secure: OZqwl85WUApFhGe9LxeSH+Fkb0rimfK6dMxHtF5flhGZvBkupQjXTaAbs/KGaFeKk/QxQIfmAkuufx3qLITpzzJKWmXUTiWKBJoGcW8qX482qVOKrAK7FG7QlDER6ie3PahOvg1Pyn4H2DedoGHaky02tnUuAIw4hG9HfjeMr+KJ9fcaSz+LPD/IJFFJz9WhqOausdp//xVnUM4Y6ZVS41I19ifhL57QKY0MVoI4a/Wrjh9FAL44bFnPPlUE0WBIv7SMWDYC8Pg+FuyNRA8nuclWv/U0jU6qAf9IePlrhdwJj0LeM//TKGgGJs/XhyWDMns6ejOZC1XDRTtKpLoevAzOOFEe4NbjSXtSp1vbx4Z7bkYAcn6S9uFEeu36qCoU7r1ezCtkUpNx1n3K6efCXChbv7GdlG/bDi6QlaFA4VjERG1Lnqknr/80wBhHlu/ICarg/Cw5P0drWjxh9R2aQ/dGHbnP42Iw7lgMkaVo3pwmfm1b2pnZcMseRHHE4rkbcgzGiQpG0Vf1OapkL4DXC+5UqbpQEpLJZhxe9rKOSOtXKUSXVZXYdc697HQHe2zG1bOL28ZAP7xtEnMb/MgQeDZmM5SFUT6zz3gSwiSKE2pr60PAQH+IDykBUBQIoNjLMiDUd89IqLgB7WsRLplBG3chVuhqatS6NnVp3Fa4txI=

build.gradle

@@ -1,9 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     ext.mockito_version = '2.25.1'
-    ext.spekVersion = '1.2.1'
     ext.androidJunit5Version = '1.4.2.1'
     ext.junitJupiterVersion = "5.4.2"
     ext.junitVintageVersion = "5.4.2"
@@ -16,9 +15,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.junit.platform:junit-platform-gradle-plugin:1.2.0"
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:$androidJunit5Version"
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2'

photomanipulator/build.gradle

@@ -1,8 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'de.mannodermaus.android-junit5'
-apply plugin: 'jacoco-android'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
@@ -16,7 +14,6 @@ android {
         versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArgument "runnerBuilder", "de.mannodermaus.junit5.AndroidJUnit5Builder"
     }
 
     compileOptions {
@@ -40,12 +37,10 @@ android {
     }
 
     testOptions {
-        junitPlatform {
-            filters {
-                engines {
-                    include 'spek'
-                }
-            }
+        animationsDisabled true
+
+        unitTests {
+            includeAndroidResources true
         }
     }
 }
@@ -57,35 +52,19 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
 
-    // (Required) Writing and executing Unit Tests on the JUnit Platform
-    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
-
-    // (Optional) If you need "Parameterized Tests"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion"
+    testImplementation 'org.hamcrest:hamcrest:2.1'
+    testImplementation 'org.hamcrest:hamcrest-library:2.1'
 
-    // (Optional) If you also have JUnit 4-based tests
     testImplementation 'junit:junit:4.12'
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVintageVersion"
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     androidTestImplementation 'androidx.test:core:1.2.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
 
-    // Tests - Spek
-    testImplementation("org.jetbrains.spek:spek-api:$spekVersion") {
-        exclude group: "org.jetbrains.kotlin"
-    }
-    testImplementation("org.jetbrains.spek:spek-junit-platform-engine:$spekVersion") {
-        exclude group: "org.junit.platform"
-        exclude group: "org.jetbrains.kotlin"
-    }
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     // Mockito
     testImplementation "org.mockito:mockito-core:$mockito_version"
     androidTestImplementation "org.mockito:mockito-android:$mockito_version"
-
-    testImplementation 'org.hamcrest:hamcrest-library:2.1'
 }
 repositories {
     mavenCentral()
@@ -115,6 +94,7 @@ ext {
     allLicenses = ["MIT"]
 }
 
+apply from: "${project.projectDir}/jacoco.gradle"
 apply from: "$rootDir/gradle/jcenter.gradle"
 
 if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {

photomanipulator/jacoco.gradle

@@ -0,0 +1,20 @@
+apply plugin: 'jacoco'
+
+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: "${buildDir}/intermediates/classes/debug", excludes: fileFilter)
+    def kotlinDebugTree = fileTree(dir: "${buildDir}/tmp/kotlin-classes/debug", excludes: fileFilter)
+    def mainSrc = "${project.projectDir}/src/main/java"
+
+    sourceDirectories = files([mainSrc])
+    classDirectories = files([debugTree, kotlinDebugTree])
+    executionData = fileTree(dir: "$buildDir", includes: [
+            "jacoco/*.exec",
+            "outputs/code_coverage/**/*coverage.ec"
+    ])
+}

photomanipulator/src/androidTest/java/com/guhungry/photomanipulator/BitmapUtilsAndroidTest.kt

@@ -5,8 +5,8 @@ import android.graphics.BitmapFactory
 import android.graphics.ColorSpace
 import android.graphics.PointF
 import android.util.DisplayMetrics
+import androidx.annotation.DrawableRes
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
 import com.guhungry.photomanipulator.test.R
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -16,31 +16,77 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 internal class BitmapUtilsAndroidTest {
-    var background: Bitmap? = null
-    var overlay: Bitmap? = null
+    private var background: Bitmap? = null
+    private var overlay: Bitmap? = null
+    private var output: Bitmap? = null
 
     @After
     fun tearDown() {
         background?.recycle()
         background = null
         overlay?.recycle()
         overlay = null
+        output?.recycle()
+        output = null
+    }
+
+    @Test
+    fun crop_should_have_correct_size() {
+        FileUtils.openBitmapInputStream(TestHelper.context(), TestHelper.drawableUri(R.drawable.background)).use {
+            output = BitmapUtils.crop(it, CGRect(79, 45, 32, 96), BitmapFactory.Options())
+
+            assertThat(output!!.width, equalTo(32))
+            assertThat(output!!.height, equalTo(96))
+        }
+    }
+
+    @Test
+    fun cropAndResize_when_portrait_should_have_correct_size() {
+        FileUtils.openBitmapInputStream(TestHelper.context(), TestHelper.drawableUri(R.drawable.background)).use {
+            output = BitmapUtils.cropAndResize(it, CGRect(79, 45, 32, 96), CGSize(19, 48), BitmapFactory.Options())
+
+            assertThat(output!!.width, equalTo(19))
+            assertThat(output!!.height, equalTo(48))
+        }
+    }
+
+    @Test
+    fun cropAndResize_when_landscaape_should_have_correct_size() {
+        FileUtils.openBitmapInputStream(TestHelper.context(), TestHelper.drawableUri(R.drawable.background)).use {
+            output = BitmapUtils.cropAndResize(it, CGRect(79, 45, 32, 96), CGSize(15, 48), BitmapFactory.Options())
+
+            assertThat(output!!.width, equalTo(15))
+            assertThat(output!!.height, equalTo(48))
+        }
     }
 
     @Test
     fun overlay_should_overlay_image_at_correct_location() {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
         val options = BitmapFactory.Options().apply {
             inMutable = true
             inTargetDensity = DisplayMetrics.DENSITY_DEFAULT
             inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.SRGB)
         }
-        background = BitmapFactory.decodeResource(context.resources, R.drawable.background, options)
-        overlay = BitmapFactory.decodeResource(context.resources, R.drawable.overlay, options)
+        background = TestHelper.drawableBitmap(R.drawable.background, options)
+        overlay = TestHelper.drawableBitmap(R.drawable.overlay, options)
 
         BitmapUtils.overlay(background!!, overlay!!, PointF(75f, 145f))
 
         assertThat(background!!.colorSpace, equalTo(overlay!!.colorSpace))
         assertThat(background!!.getPixel(75 + 96, 145 + 70), equalTo(overlay!!.getPixel(96, 70)))
     }
+
+    @Test
+    fun readImageDimensions_should_return_correct_dimension() {
+        assertReadImageDimensions(R.drawable.background, 800, 530)
+        assertReadImageDimensions(R.drawable.overlay, 200, 141)
+    }
+
+    private fun assertReadImageDimensions(@DrawableRes res: Int, width: Int, height: Int) {
+        val file = TestHelper.drawableUri(res)
+        FileUtils.openBitmapInputStream(TestHelper.context(), file).use {
+            val size = BitmapUtils.readImageDimensions(it)
+            assertThat(size, equalTo(CGSize(width, height)))
+        }
+    }
 }

photomanipulator/src/androidTest/java/com/guhungry/photomanipulator/ExampleInstrumentedTest.java

@@ -1,13 +1,14 @@
 package com.guhungry.photomanipulator;
 
 import android.content.Context;
-import androidx.test.platform.app.InstrumentationRegistry;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.

photomanipulator/src/androidTest/java/com/guhungry/photomanipulator/FileUtilsAndroidTest.kt

@@ -0,0 +1,49 @@
+package com.guhungry.photomanipulator
+
+import android.graphics.Bitmap
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.guhungry.photomanipulator.test.R
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.instanceOf
+import org.hamcrest.Matchers.greaterThan
+import org.hamcrest.core.StringEndsWith
+import org.hamcrest.core.StringStartsWith
+import org.junit.Assert.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.InputStream
+
+@RunWith(AndroidJUnit4::class)
+class FileUtilsAndroidTest {
+    @Test
+    fun createTempFile_WhenPrefixSuffix_ShouldReturnTempFileCorrectly() {
+        val actual = FileUtils.createTempFile(TestHelper.context(), "RNMP_PFEFIX_BEE", MimeUtils.WEBP).apply {
+            deleteOnExit()
+        }
+
+        assertThat(actual.name, StringStartsWith("RNMP_PFEFIX_BEE"))
+        assertThat(actual.name, StringEndsWith(".webp"))
+    }
+
+    @Test
+    fun saveImageFile_ShouldIncreaseFileSize() {
+        val image = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+        val output = FileUtils.createTempFile(TestHelper.context(), "TEST_SAVE_IMAGE", MimeUtils.PNG).apply {
+            deleteOnExit()
+        }
+
+        assertThat(output.length(), equalTo(0L))
+        FileUtils.saveImageFile(image, MimeUtils.PNG, 100, output)
+
+        assertThat(output.length(), greaterThan(0L))
+    }
+
+    @Test
+    fun openBitmapInputStream_ShouldReadDrawable() {
+        val uri = TestHelper.drawableUri(R.drawable.background)
+
+        FileUtils.openBitmapInputStream(TestHelper.context(), uri).use {
+            assertThat(it, instanceOf(InputStream::class.java))
+        }
+    }
+}

photomanipulator/src/androidTest/java/com/guhungry/photomanipulator/TestHelper.kt

@@ -0,0 +1,13 @@
+package com.guhungry.photomanipulator
+import android.graphics.BitmapFactory
+import androidx.annotation.DrawableRes
+import androidx.test.platform.app.InstrumentationRegistry
+
+object TestHelper {
+    fun context() = InstrumentationRegistry.getInstrumentation().targetContext
+    fun packageName() = context().packageName
+    fun tempDirectory() = context().cacheDir
+
+    fun drawableUri(@DrawableRes res: Int) = "android.resource://${packageName()}/${res}"
+    fun drawableBitmap(@DrawableRes res: Int, options: BitmapFactory.Options) = BitmapFactory.decodeResource(context().resources, res, options)
+}