From 573a4eb3bd0cf6996c56c63aabda81b7d97acc40 Mon Sep 17 00:00:00 2001 From: Anatoly Kislov Date: Thu, 7 Sep 2017 15:59:09 +0300 Subject: [PATCH 1/3] wip: fix test --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 02fe0561..d8cea838 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ protobuf { } sourceSets.main.java.srcDirs += 'build/generated/source/proto/main/java' -sourceSets.test.java.srcDirs += 'src/test/kotlin' +sourceSets.test.java.srcDirs += 'src/test' compileKotlin.dependsOn ':generateProto' // Include dependent libraries in archive. From b4a6e7efa901bf0706cc3fc9a603ee5fb5bf1789 Mon Sep 17 00:00:00 2001 From: Anatoly Kislov Date: Thu, 7 Sep 2017 16:16:39 +0300 Subject: [PATCH 2/3] wip: fix tests --- build.gradle | 10 +++++----- src/test/kotlin/app/CommitHasherTest.kt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index d8cea838..62b31d43 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1" - classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0-M4" + classpath "org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2" } } @@ -65,9 +65,9 @@ dependencies { version: '4.8.0.201706111038-r' testCompile 'org.jetbrains.kotlin:kotlin-test' - testCompile 'org.jetbrains.spek:spek-api:1.1.2' - testCompile 'org.junit.platform:junit-platform-runner:1.0.0-M4' - testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.2' + testCompile 'org.jetbrains.spek:spek-api:1.1.4' + testCompile 'org.junit.platform:junit-platform-runner:1.0.0-RC2' + testRuntime 'org.jetbrains.spek:spek-junit-platform-engine:1.1.4' } protobuf { @@ -77,7 +77,7 @@ protobuf { } sourceSets.main.java.srcDirs += 'build/generated/source/proto/main/java' -sourceSets.test.java.srcDirs += 'src/test' +sourceSets.test.java.srcDirs += 'src/test/kotlin' compileKotlin.dependsOn ':generateProto' // Include dependent libraries in archive. diff --git a/src/test/kotlin/app/CommitHasherTest.kt b/src/test/kotlin/app/CommitHasherTest.kt index 67a8e5ad..17934334 100644 --- a/src/test/kotlin/app/CommitHasherTest.kt +++ b/src/test/kotlin/app/CommitHasherTest.kt @@ -1,9 +1,9 @@ +package app + // Copyright 2017 Sourcerer Inc. All Rights Reserved. // Author: Liubov Yaronskaya (lyaronskaya@sourcerer.io) // Author: Anatoly Kislov (anatoly@sourcerer.io) -package app - import app.api.MockApi import app.hashers.CommitHasher import app.model.* From 8c3f092a2f76cfe1a8f98456e260948bbed9f77c Mon Sep 17 00:00:00 2001 From: Anatoly Kislov Date: Thu, 7 Sep 2017 16:24:35 +0300 Subject: [PATCH 3/3] chore: fix copyright --- src/test/kotlin/app/CommitHasherTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/kotlin/app/CommitHasherTest.kt b/src/test/kotlin/app/CommitHasherTest.kt index 17934334..67a8e5ad 100644 --- a/src/test/kotlin/app/CommitHasherTest.kt +++ b/src/test/kotlin/app/CommitHasherTest.kt @@ -1,9 +1,9 @@ -package app - // Copyright 2017 Sourcerer Inc. All Rights Reserved. // Author: Liubov Yaronskaya (lyaronskaya@sourcerer.io) // Author: Anatoly Kislov (anatoly@sourcerer.io) +package app + import app.api.MockApi import app.hashers.CommitHasher import app.model.*