From b3bffad3414bd5c27a6301e64717b4b786f24672 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Wed, 16 Dec 2015 01:40:03 +0400
Subject: [PATCH] Better SpekRunner.

---
 .../com/beust/kobalt/internal/JUnitRunner.kt    |  7 ++++---
 .../com/beust/kobalt/internal/SpekRunner.kt     | 17 ++---------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
index b4c28c7f..5d0cb604 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/JUnitRunner.kt
@@ -5,15 +5,16 @@ import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.KobaltContext
 import com.beust.kobalt.api.Project
 
-public class JUnitRunner() : GenericTestRunner() {
+open public class JUnitRunner() : GenericTestRunner() {
 
     override val mainClass = "org.junit.runner.JUnitCore"
 
+    open val dependencyName = "junit"
+
     override fun affinity(project: Project, context: KobaltContext) =
-            if (project.testDependencies.any { it.id.contains("junit")}) IAffinity.DEFAULT_POSITIVE_AFFINITY
+            if (project.testDependencies.any { it.id.contains(dependencyName)}) IAffinity.DEFAULT_POSITIVE_AFFINITY
             else 0
 
     override fun args(project: Project, classpath: List<IClasspathDependency>) = findTestClasses(project, classpath)
-
 }
 
diff --git a/src/main/kotlin/com/beust/kobalt/internal/SpekRunner.kt b/src/main/kotlin/com/beust/kobalt/internal/SpekRunner.kt
index c7d1c251..923938f2 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/SpekRunner.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/SpekRunner.kt
@@ -1,19 +1,6 @@
 package com.beust.kobalt.internal
 
-import com.beust.kobalt.api.IAffinity
-import com.beust.kobalt.api.IClasspathDependency
-import com.beust.kobalt.api.KobaltContext
-import com.beust.kobalt.api.Project
-
-public class SpekRunner() : GenericTestRunner() {
-
-    override val mainClass = "org.junit.runner.JUnitCore"
-
-    override fun affinity(project: Project, context: KobaltContext) =
-            if (project.testDependencies.any { it.id.contains("org.jetbrains.spek")})IAffinity.DEFAULT_POSITIVE_AFFINITY
-            else 0
-
-    override fun args(project: Project, classpath: List<IClasspathDependency>) = findTestClasses(project, classpath)
-
+public class SpekRunner() : JUnitRunner() {
+    override val dependencyName = "org.jetbrains.spek"
 }