Commit c86677ba authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Merge branch 'develop' into feature-shiva

parents 9bfb4880 4aa6f273
......@@ -48,7 +48,7 @@ class ConfigTest extends TestNGSuite with Matchers with ConfigUtils.ImplicitConv
Config.getValueFromMap(map, new ConfigValueIndex("5", List("1", "2", "3", "dummy", "dummy", "4", "5"), "k1")).get.asString shouldBe "v1"
}
@DataProvider(name = "testGetValueFromMapProvider", parallel = true)
@DataProvider(name = "testGetValueFromMapProvider")
def testGetValueFromMapProvider() = {
Array(
Array("m1", Nil, "k1", true, "v2"),
......
......@@ -28,7 +28,7 @@ class CarpTest extends TestNGSuite with Matchers {
}
}
@DataProvider(name = "carpOptions", parallel = true)
@DataProvider(name = "carpOptions")
def carpOptions = {
val bool = Array(true, false)
......
......@@ -29,7 +29,7 @@ class FlexiprepTest extends TestNGSuite with Matchers {
}
}
@DataProvider(name = "flexiprepOptions", parallel = true)
@DataProvider(name = "flexiprepOptions")
def flexiprepOptions = {
val paired = Array(true, false)
val skipTrims = Array(true, false)
......
......@@ -30,7 +30,7 @@ class MappingTest extends TestNGSuite with Matchers {
}
}
@DataProvider(name = "mappingOptions", parallel = true)
@DataProvider(name = "mappingOptions")
def mappingOptions = {
val aligners = Array("bwa", "bwa-aln", "star", "star-2pass", "bowtie", "stampy")
val paired = Array(true, false)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment