Merge pull request #97 from nhaarman/deprecation-levels

Upgrade deprecation levels to ERROR

Author: nhaarman

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/ArgumentCaptor.kt

@@ -32,7 +32,7 @@ inline fun <reified T : Any> argumentCaptor(): KArgumentCaptor<T> = KArgumentCap
 
 inline fun <reified T : Any> capture(captor: ArgumentCaptor<T>): T = captor.capture() ?: createInstance<T>()
 
-@Deprecated("Use captor.capture() instead.", ReplaceWith("captor.capture()"))
+@Deprecated("Use captor.capture() instead.", ReplaceWith("captor.capture()"), DeprecationLevel.ERROR)
 inline fun <reified T : Any> capture(captor: KArgumentCaptor<T>): T = captor.capture()
 
 class KArgumentCaptor<out T : Any>(private val captor: ArgumentCaptor<T>, private val tClass: KClass<T>) {
@@ -51,7 +51,7 @@ class KArgumentCaptor<out T : Any>(private val captor: ArgumentCaptor<T>, privat
  * Instead, use [argumentCaptor] in the traditional way, or use one of
  * [argThat], [argForWhich] or [check].
  */
-@Deprecated("Use argumentCaptor() or argThat() instead.")
+@Deprecated("Use argumentCaptor() or argThat() instead.", ReplaceWith("check(consumer)"), DeprecationLevel.ERROR)
 inline fun <reified T : Any> capture(noinline consumer: (T) -> Unit): T {
     var times = 0
     return argThat { if (++times == 1) consumer.invoke(this); true }

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/Mockito.kt

@@ -130,14 +130,14 @@ fun verifyZeroInteractions(vararg mocks: Any) = Mockito.verifyZeroInteractions(*
 fun <T> whenever(methodCall: T): OngoingStubbing<T> = Mockito.`when`(methodCall)!!
 fun withSettings(): MockSettings = Mockito.withSettings()!!
 
-@Deprecated("Use any() instead.", ReplaceWith("any()"))
+@Deprecated("Use any() instead.", ReplaceWith("any()"), DeprecationLevel.ERROR)
 inline fun <reified T : Any> anyCollection(): Collection<T> = any()
 
-@Deprecated("Use any() instead.", ReplaceWith("any()"))
+@Deprecated("Use any() instead.", ReplaceWith("any()"), DeprecationLevel.ERROR)
 inline fun <reified T : Any> anyList(): List<T> = any()
 
-@Deprecated("Use any() instead.", ReplaceWith("any()"))
+@Deprecated("Use any() instead.", ReplaceWith("any()"), DeprecationLevel.ERROR)
 inline fun <reified T : Any> anySet(): Set<T> = any()
 
-@Deprecated("Use any() instead.", ReplaceWith("any()"))
+@Deprecated("Use any() instead.", ReplaceWith("any()"), DeprecationLevel.ERROR)
 inline fun <reified K : Any, reified V : Any> anyMap(): Map<K, V> = any()

mockito-kotlin/src/test/kotlin/MockitoTest.kt

@@ -73,42 +73,6 @@ class MockitoTest {
         }
     }
 
-    @Test
-    fun anyCollectionOfClosed() {
-        mock<Methods>().apply {
-            closedCollection(listOf())
-            verify(this).closedCollection(any())
-            verify(this).closedCollection(anyCollection())
-        }
-    }
-
-    @Test
-    fun anyListOfClosed() {
-        mock<Methods>().apply {
-            closedList(listOf())
-            verify(this).closedList(any())
-            verify(this).closedList(anyList())
-        }
-    }
-
-    @Test
-    fun anyClosedStringMap() {
-        mock<Methods>().apply {
-            closedStringMap(mapOf())
-            verify(this).closedStringMap(any())
-            verify(this).closedStringMap(anyMap())
-        }
-    }
-
-    @Test
-    fun anyClosedSet() {
-        mock<Methods>().apply {
-            closedSet(setOf())
-            verify(this).closedSet(any())
-            verify(this).closedSet(anySet())
-        }
-    }
-
     @Test
     fun anyStringVararg() {
         mock<Methods>().apply {