From 5eb775cb373f47b4e9576c3432274bd31e87dff4 Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Sun, 15 May 2016 22:17:39 +0200
Subject: [PATCH] switch to trait
---
.../pipelines/mapping/MultisampleMappingTest.scala | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mapping/src/test/scala/nl/lumc/sasc/biopet/pipelines/mapping/MultisampleMappingTest.scala b/mapping/src/test/scala/nl/lumc/sasc/biopet/pipelines/mapping/MultisampleMappingTest.scala
index f0449a7e0..5798dba70 100644
--- a/mapping/src/test/scala/nl/lumc/sasc/biopet/pipelines/mapping/MultisampleMappingTest.scala
+++ b/mapping/src/test/scala/nl/lumc/sasc/biopet/pipelines/mapping/MultisampleMappingTest.scala
@@ -14,7 +14,7 @@ import org.testng.annotations.{DataProvider, Test}
/**
* Created by pjvanthof on 15/05/16.
*/
-class MultisampleMappingTest extends TestNGSuite with Matchers {
+trait MultisampleMappingTestTrait extends TestNGSuite with Matchers {
def initPipeline(map: Map[String, Any]): MultisampleMapping = {
new MultisampleMapping() {
override def configNamespace = "multisamplemapping"
@@ -27,13 +27,14 @@ class MultisampleMappingTest extends TestNGSuite with Matchers {
def mergeStrategies = MultisampleMapping.MergeStrategy.values
def bamToFastq = false
def correctReadgroups = false
+ def sample1 = Array(true, false)
+ def sample2 = Array(true, false)
@DataProvider(name = "mappingOptions")
def mappingOptions = {
- val bool = Array(true, false)
for (
- merge <- mergeStrategies.toArray; sample2 <- bool
- ) yield Array(merge, true, sample2)
+ merge <- mergeStrategies.toArray; s1 <- sample1 ; s2 <- sample2
+ ) yield Array(merge, s1, s2)
}
@Test(dataProvider = "mappingOptions")
@@ -68,6 +69,10 @@ class MultisampleMappingTest extends TestNGSuite with Matchers {
}
}
+class MultisampleMappingTest extends MultisampleMappingTestTrait {
+ override def sample1 = Array(true)
+}
+
object MultisampleMappingTestTrait {
val outputDir = Files.createTempDir()
outputDir.deleteOnExit()
--
GitLab