From c6a07e3eaf6083f3c4090e45a183cf77285224e1 Mon Sep 17 00:00:00 2001 From: Ilya Lim Date: Thu, 10 Oct 2019 16:33:48 +0700 Subject: [PATCH] Update to mockito-kotlin 2 --- .../test/kotlin/com/agoda/boots/BootsTest.kt | 25 +++++++++---------- .../test/kotlin/com/agoda/boots/KeyTest.kt | 2 +- .../agoda/boots/impl/DefaultNotifierTest.kt | 8 +++--- .../agoda/boots/impl/DefaultSequencerTest.kt | 4 +-- gradle/scripts/dependencies.gradle | 12 ++++----- .../src/main/kotlin/com/agoda/boots/Mocker.kt | 8 +++--- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/boots/src/test/kotlin/com/agoda/boots/BootsTest.kt b/boots/src/test/kotlin/com/agoda/boots/BootsTest.kt index 4559ad6..daf08d4 100644 --- a/boots/src/test/kotlin/com/agoda/boots/BootsTest.kt +++ b/boots/src/test/kotlin/com/agoda/boots/BootsTest.kt @@ -1,18 +1,17 @@ package com.agoda.boots import com.agoda.boots.Key.Companion.all +import com.agoda.boots.Key.Companion.multiple import com.agoda.boots.Key.Companion.single import com.agoda.boots.Status.Booted import com.agoda.boots.impl.DefaultNotifier import com.agoda.boots.impl.DefaultReporter import com.agoda.boots.impl.DefaultSequencer -import com.nhaarman.mockito_kotlin.* +import com.nhaarman.mockitokotlin2.* import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentCaptor -import org.mockito.Captor import org.mockito.Mock import org.mockito.junit.MockitoJUnitRunner @@ -45,14 +44,14 @@ class BootsTest { fun testVerifySccFailure() { // Arrange val bootable1 = object : Bootable() { - override val key = Key.single("Key 1") - override val dependencies = Key.multiple(Key.single("Key 2")) + override val key = single("Key 1") + override val dependencies = multiple(single("Key 2")) override fun boot() {} } val bootable2 = object : Bootable() { - override val key = Key.single("Key 2") - override val dependencies = Key.multiple(Key.single("Key 1")) + override val key = single("Key 2") + override val dependencies = multiple(single("Key 1")) override fun boot() {} } @@ -64,13 +63,13 @@ class BootsTest { fun testVerifyIccFailure() { // Arrange val bootable1 = object : Bootable() { - override val key = Key.single("Key 1") + override val key = single("Key 1") override fun boot() {} } val bootable2 = object : Bootable() { - override val key = Key.single("Key 2") - override val dependencies = Key.multiple(Key.single("Key 1")) + override val key = single("Key 2") + override val dependencies = multiple(single("Key 1")) override val isCritical = true override fun boot() {} } @@ -83,12 +82,12 @@ class BootsTest { fun testAdd() { // Arrange val bootable1 = object : Bootable() { - override val key = Key.single("Key 1") + override val key = single("Key 1") override fun boot() {} } val bootable2 = object : Bootable() { - override val key = Key.single("Key 2") + override val key = single("Key 2") override fun boot() {} } @@ -171,7 +170,7 @@ class BootsTest { val bootable3 = object : Bootable() { override val key = key3 - override val dependencies = Key.multiple(key2) + override val dependencies = multiple(key2) override fun boot() {} } diff --git a/boots/src/test/kotlin/com/agoda/boots/KeyTest.kt b/boots/src/test/kotlin/com/agoda/boots/KeyTest.kt index 304c466..ff79231 100644 --- a/boots/src/test/kotlin/com/agoda/boots/KeyTest.kt +++ b/boots/src/test/kotlin/com/agoda/boots/KeyTest.kt @@ -3,7 +3,7 @@ package com.agoda.boots import com.agoda.boots.Key.Companion.excluding import com.agoda.boots.Key.Companion.multiple import com.agoda.boots.Key.Companion.single -import com.nhaarman.mockito_kotlin.whenever +import com.nhaarman.mockitokotlin2.whenever import org.junit.Before import org.junit.Test import org.junit.runner.RunWith diff --git a/boots/src/test/kotlin/com/agoda/boots/impl/DefaultNotifierTest.kt b/boots/src/test/kotlin/com/agoda/boots/impl/DefaultNotifierTest.kt index 3d8098c..511b85b 100644 --- a/boots/src/test/kotlin/com/agoda/boots/impl/DefaultNotifierTest.kt +++ b/boots/src/test/kotlin/com/agoda/boots/impl/DefaultNotifierTest.kt @@ -8,10 +8,10 @@ import com.agoda.boots.Key.Companion.single import com.agoda.boots.Status.Companion.booted import com.agoda.boots.Status.Companion.failed import com.agoda.boots.Status.Companion.idle -import com.nhaarman.mockito_kotlin.any -import com.nhaarman.mockito_kotlin.verify -import com.nhaarman.mockito_kotlin.verifyZeroInteractions -import com.nhaarman.mockito_kotlin.whenever +import com.nhaarman.mockitokotlin2.any +import com.nhaarman.mockitokotlin2.verify +import com.nhaarman.mockitokotlin2.verifyZeroInteractions +import com.nhaarman.mockitokotlin2.whenever import org.junit.After import org.junit.Before import org.junit.Test diff --git a/boots/src/test/kotlin/com/agoda/boots/impl/DefaultSequencerTest.kt b/boots/src/test/kotlin/com/agoda/boots/impl/DefaultSequencerTest.kt index 248555a..c9adba7 100644 --- a/boots/src/test/kotlin/com/agoda/boots/impl/DefaultSequencerTest.kt +++ b/boots/src/test/kotlin/com/agoda/boots/impl/DefaultSequencerTest.kt @@ -5,8 +5,8 @@ import com.agoda.boots.Key.Companion.critical import com.agoda.boots.Key.Companion.multiple import com.agoda.boots.Key.Companion.single import com.agoda.boots.Status.Companion.booted -import com.nhaarman.mockito_kotlin.any -import com.nhaarman.mockito_kotlin.whenever +import com.nhaarman.mockitokotlin2.any +import com.nhaarman.mockitokotlin2.whenever import org.junit.After import org.junit.Before import org.junit.Test diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index 3fdc36f..dd72c7c 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -8,14 +8,14 @@ ext.versions = [ rxAndroid : '1.2.1', appcompat : '28.0.0', junit : '4.12', - mockito : '2.21.0', - mockitoKotlin : '1.6.0', + mockito : '2.23.0', + mockitoKotlin : '2.2.0', espresso : '3.0.2', testRunner : '1.0.2', testRules : '1.0.2', kakao : '1.4.0', - boots : '1.0.1', - bootsCode : 22, + boots : '1.1.0', + bootsCode : 23, compileSdk : 28, targetSdk : 28, minSdk : 16 @@ -38,7 +38,7 @@ ext.libraries = [ appcompat : "com.android.support:appcompat-v7:$versions.appcompat", junit : "junit:junit:$versions.junit", mockito : "org.mockito:mockito-core:$versions.mockito", - mockitoKotlin : "com.nhaarman:mockito-kotlin:$versions.mockitoKotlin", + mockitoKotlin : "com.nhaarman.mockitokotlin2:mockito-kotlin:$versions.mockitoKotlin", espresso : "com.android.support.test.espresso:espresso-core:$versions.espresso", testRunner : "com.android.support.test:runner:$versions.testRunner", testRules : "com.android.support.test:rules:$versions.testRules", @@ -52,5 +52,5 @@ ext.boots = [ url : 'https://github.com/agoda-com/boots', git : 'https://github.com/agoda-com/boots.git', group : 'com.agoda.boots', - version : '1.0.1' + version : '1.1.0' ] diff --git a/test/src/main/kotlin/com/agoda/boots/Mocker.kt b/test/src/main/kotlin/com/agoda/boots/Mocker.kt index 66212e9..9c17dc8 100644 --- a/test/src/main/kotlin/com/agoda/boots/Mocker.kt +++ b/test/src/main/kotlin/com/agoda/boots/Mocker.kt @@ -1,10 +1,10 @@ package com.agoda.boots import com.agoda.boots.Status.Companion.booted -import com.nhaarman.mockito_kotlin.any -import com.nhaarman.mockito_kotlin.eq -import com.nhaarman.mockito_kotlin.mock -import com.nhaarman.mockito_kotlin.whenever +import com.nhaarman.mockitokotlin2.any +import com.nhaarman.mockitokotlin2.eq +import com.nhaarman.mockitokotlin2.mock +import com.nhaarman.mockitokotlin2.whenever import org.mockito.Mockito.lenient /**