Kayenta tests (#2056)

* refactor(kayenta): Use strongly typed classes to represent Kayenta stage config. * refactor(kayenta): Migrate tests to Kotlin
spinnaker · Mar 16, 2018 · ac28355 · ac28355
1 parent 7e843cd
commit ac28355
Show file tree

Hide file tree

Showing 19 changed files with 560 additions and 541 deletions.
diff --git a/orca-kayenta/orca-kayenta.gradle b/orca-kayenta/orca-kayenta.gradle
@@ -16,13 +16,11 @@
 
 apply from: "$rootDir/gradle/kotlin.gradle"
 apply from: "$rootDir/gradle/spek.gradle"
-apply from: "$rootDir/gradle/spock.gradle"
 
 dependencies {
   compile project(":orca-kotlin")
   compile project(":orca-retrofit")
 
-  testCompile project(":orca-test-groovy")
   testCompile project(":orca-test-kotlin")
   testCompile "com.github.tomakehurst:wiremock:2.15.0"
 }
diff --git a/...src/test/groovy/com/netflix/spinnaker/orca/kayenta/pipeline/KayentaCanaryStageSpec.groovy b/...src/test/groovy/com/netflix/spinnaker/orca/kayenta/pipeline/KayentaCanaryStageSpec.groovy
diff --git a/...est/groovy/com/netflix/spinnaker/orca/kayenta/tasks/AggregateCanaryResultsTaskSpec.groovy b/...est/groovy/com/netflix/spinnaker/orca/kayenta/tasks/AggregateCanaryResultsTaskSpec.groovy
diff --git a/orca-kayenta/src/test/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaServiceTest.kt b/orca-kayenta/src/test/kotlin/com/netflix/spinnaker/orca/kayenta/KayentaServiceTest.kt
@@ -21,6 +21,7 @@ import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.client.WireMock.*
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
 import com.netflix.spinnaker.orca.kayenta.config.KayentaConfiguration
+import com.netflix.spinnaker.time.fixedClock
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
@@ -58,7 +59,7 @@ object KayentaServiceTest : Spek({
 
   describe("the Kayenta service") {
 
-    val clock = Clock.fixed(Instant.now(), ZoneId.systemDefault())
+    val clock = fixedClock()
     val canaryConfigId = randomUUID().toString()
     val mapper = jacksonObjectMapper()