diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala index 8f32e947b395a60234a4fd629711e4f1db63bd2d..d40690df75e79622d8191695aca49ab56c5407b4 100644 --- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala +++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala @@ -85,7 +85,7 @@ class Fastqc(val root: Configurable) extends BiopetCommandLineFunction with Vers /** return commandline to execute */ def cmdLine = required(executable) + - optional("--java", java_exe) + + optional("--java", javaExe) + optional("--threads", threads) + optional("--contaminants", contaminants) + optional("--adapters", adapters) + diff --git a/public/tinycap/src/test/scala/nl/lucm/sasc/biopet/pipelines/tinycap/TinyCapTest.scala b/public/tinycap/src/test/scala/nl/lumc/sasc/biopet/pipelines/tinycap/TinyCapTest.scala similarity index 98% rename from public/tinycap/src/test/scala/nl/lucm/sasc/biopet/pipelines/tinycap/TinyCapTest.scala rename to public/tinycap/src/test/scala/nl/lumc/sasc/biopet/pipelines/tinycap/TinyCapTest.scala index b8ec5c3ab159b584c5935bc87e29892799216a71..7275b4349ec04a0e39cc45693173201bff1cc17f 100644 --- a/public/tinycap/src/test/scala/nl/lucm/sasc/biopet/pipelines/tinycap/TinyCapTest.scala +++ b/public/tinycap/src/test/scala/nl/lumc/sasc/biopet/pipelines/tinycap/TinyCapTest.scala @@ -35,7 +35,7 @@ class TinyCapTest extends TestNGSuite with Matchers { def initPipeline(map: Map[String, Any]): TinyCap = { new TinyCap() { - override def configName = "tinycap" + override def configNamespace = "tinycap" override def globalConfig = new Config(map)