Skip to content

Commit cdc34a0

Browse files
authored
Merge pull request #120 from nhaarman/cast-null
Use `null as T` to create instances
2 parents ae1d863 + 18ed580 commit cdc34a0

20 files changed

+484
-329
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
package com.nhaarman.mockito_kotlin
2727

28+
import com.nhaarman.mockito_kotlin.createinstance.createInstance
2829
import org.mockito.ArgumentCaptor
2930
import kotlin.reflect.KClass
3031

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

Lines changed: 0 additions & 225 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
package com.nhaarman.mockito_kotlin
2727

28+
import com.nhaarman.mockito_kotlin.createinstance.createInstance
2829
import org.mockito.InOrder
2930
import org.mockito.MockSettings
3031
import org.mockito.MockingDetails
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* The MIT License
3+
*
4+
* Copyright (c) 2016 Niek Haarman
5+
* Copyright (c) 2007 Mockito contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
26+
package com.nhaarman.mockito_kotlin.createinstance
27+
28+
import kotlin.reflect.KClass
29+
import java.lang.reflect.Array as JavaArray
30+
31+
32+
inline fun <reified T : Any> createInstance(): T
33+
= createInstance(T::class)
34+
35+
fun <T : Any> createInstance(kClass: KClass<T>): T
36+
= nonNullProvider().createInstance(kClass)

0 commit comments

Comments
 (0)