Merge branch 'inktomi-deep-stubs-deprecation' into dev

nhaarman · nhaarman · commit 8bc0ee3fb327 · 2017-09-27T14:55:13.000+02:00
diff --git a/mockito-kotlin/src/test/kotlin/test/MockTest.kt b/mockito-kotlin/src/test/kotlin/test/MockTest.kt
@@ -81,7 +81,7 @@ class MockTest : TestBase() {
 
     @Test
     fun deepStubs() {
-        val cal: Calendar = mock(RETURNS_DEEP_STUBS)
+        val cal: Calendar = mock(defaultAnswer = RETURNS_DEEP_STUBS)
         whenever(cal.time.time).thenReturn(123L)
         expect(cal.time.time).toBe(123L)
     }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class MockTest : TestBase() {`
`81`	`81`
`82`	`82`	`@Test`
`83`	`83`	`fun deepStubs() {`
`84`		`- val cal: Calendar = mock(RETURNS_DEEP_STUBS)`
	`84`	`+ val cal: Calendar = mock(defaultAnswer = RETURNS_DEEP_STUBS)`
`85`	`85`	`whenever(cal.time.time).thenReturn(123L)`
`86`	`86`	`expect(cal.time.time).toBe(123L)`
`87`	`87`	`}`