Skip to content

Commit 9daf01f

Browse files
authored
Merge pull request #143 from nhaarman/update-kotlin
Update Kotlin to 1.0.6
2 parents 17056aa + e08b8a0 commit 9daf01f

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ language: java
55
matrix:
66
include:
77
- jdk: oraclejdk7
8-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5-3
8+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.6
99
- jdk: oraclejdk7
10-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M03
10+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M04
1111
- jdk: oraclejdk8
12-
env: TERM=dumb KOTLIN_VERSION=1.0.5-3
12+
env: TERM=dumb KOTLIN_VERSION=1.0.6
1313
- jdk: oraclejdk8
14-
env: TERM=dumb KOTLIN_VERSION=1.1-M03
14+
env: TERM=dumb KOTLIN_VERSION=1.1-M04
1515

1616

1717
env:

mockito-kotlin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply from: './publishing.gradle'
33
apply plugin: 'org.jetbrains.dokka'
44

55
buildscript {
6-
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5-3'
6+
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.6'
77

88
repositories {
99
mavenCentral()

mockito-kotlin/src/test/kotlin/test/inline/UsingMockMakerInlineTest.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424

2525
import com.nhaarman.expect.expect
26-
import com.nhaarman.expect.expectErrorWithMessage
2726
import com.nhaarman.mockito_kotlin.*
2827
import com.nhaarman.mockito_kotlin.createinstance.InstanceCreator
2928
import com.nhaarman.mockito_kotlin.createinstance.mockMakerInlineEnabled
@@ -129,13 +128,12 @@ class UsingMockMakerInlineTest {
129128
}
130129

131130
@Test
132-
fun sealedClass_fails() {
133-
/* Expect */
134-
expectErrorWithMessage("Could not create") on {
131+
fun sealedMemberClass() {
132+
/* When */
133+
val result = createInstance<MySealedClass>()
135134

136-
/* When */
137-
createInstance<MySealedClass>()
138-
}
135+
/* Then */
136+
expect(result).toNotBeNull()
139137
}
140138

141139
@Test

0 commit comments

Comments
 (0)