Skip to content

Commit 0cd644e

Browse files
Piotr Zawadzkizawadz88
authored andcommitted
- Rewritten material-stepper tests to Kotlin
- Added tests for checking onSelected() calls on step fragments
1 parent a7280cd commit 0cd644e

19 files changed

+579
-606
lines changed

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ buildscript {
1818
allprojects {
1919
repositories {
2020
jcenter()
21+
mavenCentral()
2122
}
2223
}
2324

@@ -31,7 +32,8 @@ configure(allprojects) {
3132
androidSupportLibraryVersion = '25.3.1'
3233

3334
junitVersion = '4.12'
34-
mockitoVersion = '1.10.19'
35+
mockitoVersion = '2.7.21'
36+
mockitoKotlinVersion = '1.4.0'
3537
robolectricVersion = '3.3.1'
3638
assertjVersion = '1.1.1'
3739

material-stepper/build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'kotlin-android'
23
apply plugin: 'maven'
34
apply from: '../material-stepper/code_coverage.gradle'
45
apply from: '../config/quality/quality.gradle'
@@ -29,7 +30,7 @@ ext {
2930

3031
android {
3132
compileSdkVersion project.androidCompileSdkVersion
32-
buildToolsVersion ("$androidBuildToolsVersion")
33+
buildToolsVersion("$androidBuildToolsVersion")
3334

3435
defaultConfig {
3536
minSdkVersion project.androidMinSdkVersion
@@ -59,15 +60,18 @@ android {
5960
}
6061

6162
dependencies {
62-
compile ("com.android.support:appcompat-v7:$androidSupportLibraryVersion")
63+
compile "com.android.support:appcompat-v7:$androidSupportLibraryVersion"
6364

64-
testCompile("junit:junit:$junitVersion")
65-
testCompile("org.mockito:mockito-core:$mockitoVersion")
66-
testCompile("com.squareup.assertj:assertj-android:$assertjVersion")
65+
testCompile "junit:junit:$junitVersion"
66+
testCompile "org.mockito:mockito-core:$mockitoVersion"
67+
testCompile "com.squareup.assertj:assertj-android:$assertjVersion"
6768
testCompile("org.robolectric:robolectric:$robolectricVersion") {
6869
exclude group: 'commons-logging', module: 'commons-logging'
6970
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
7071
}
72+
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
73+
testCompile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
74+
testCompile "com.nhaarman:mockito-kotlin:$mockitoKotlinVersion"
7175
}
7276

7377
gradle.taskGraph.beforeTask { Task task ->
@@ -81,7 +85,7 @@ gradle.taskGraph.beforeTask { Task task ->
8185
}
8286

8387
// Log out test results to console
84-
tasks.matching {it instanceof Test}.all {
88+
tasks.matching { it instanceof Test }.all {
8589
testLogging.events = ["failed", "passed", "skipped"]
8690
}
8791

material-stepper/src/test/java/com/stepstone/stepper/StepperLayoutSanityTest.java

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

0 commit comments

Comments
 (0)