Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
65aa873f
Commit
65aa873f
authored
Jun 13, 2016
by
Peter van 't Hof
Browse files
Fixed gears tests
parent
18bc6d01
Changes
2
Hide whitespace changes
Inline
Side-by-side
gears/src/main/scala/nl/lumc/sasc/biopet/pipelines/gears/GearsSingle.scala
View file @
65aa873f
...
...
@@ -16,8 +16,9 @@ package nl.lumc.sasc.biopet.pipelines.gears
import
nl.lumc.sasc.biopet.core.summary.SummaryQScript
import
nl.lumc.sasc.biopet.core.BiopetQScript.InputFile
import
nl.lumc.sasc.biopet.core.
{
PipelineCommand
,
SampleLibraryTag
}
import
nl.lumc.sasc.biopet.core.
{
PipelineCommand
,
SampleLibraryTag
}
import
nl.lumc.sasc.biopet.pipelines.flexiprep.Flexiprep
import
nl.lumc.sasc.biopet.utils.Logging
import
nl.lumc.sasc.biopet.utils.config.Configurable
import
org.broadinstitute.gatk.queue.QScript
...
...
@@ -48,6 +49,7 @@ class GearsSingle(val root: Configurable) extends QScript with SummaryQScript wi
def
init
()
:
Unit
=
{
require
(
fastqR1
.
isDefined
||
bamFile
.
isDefined
,
"Please specify fastq-file(s) or bam file"
)
require
(
fastqR1
.
isDefined
!=
bamFile
.
isDefined
,
"Provide either a bam file or a R1/R2 file"
)
if
(
sampleId
==
null
||
sampleId
==
None
)
Logging
.
addError
(
"Missing sample ID on GearsSingle module"
)
if
(
outputName
==
null
)
{
if
(
fastqR1
.
isDefined
)
outputName
=
fastqR1
.
map
(
_
.
getName
...
...
@@ -80,6 +82,8 @@ class GearsSingle(val root: Configurable) extends QScript with SummaryQScript wi
val
flexiprep
=
new
Flexiprep
(
this
)
flexiprep
.
inputR1
=
r1
flexiprep
.
inputR2
=
r2
flexiprep
.
sampleId
=
if
(
sampleId
.
isEmpty
)
Some
(
"noSampleName"
)
else
sampleId
flexiprep
.
libId
=
if
(
libId
.
isEmpty
)
Some
(
"noLibName"
)
else
libId
flexiprep
.
outputDir
=
new
File
(
outputDir
,
"flexiprep"
)
add
(
flexiprep
)
(
flexiprep
.
fastqR1Qc
,
flexiprep
.
fastqR2Qc
)
...
...
gears/src/test/scala/nl/lumc/sasc/biopet/pipelines/gears/GearsSingleTest.scala
View file @
65aa873f
...
...
@@ -80,6 +80,8 @@ class GearsSingleTest extends TestNGSuite with Matchers {
),
Map
(
GearsSingleTest
.
executables
.
toSeq
:
_
*
))
val
gears
:
GearsSingle
=
initPipeline
(
map
)
gears
.
sampleId
=
Some
(
"sampleName"
)
gears
.
libId
=
Some
(
"libName"
)
if
(
fromBam
)
{
gears
.
bamFile
=
Some
(
GearsSingleTest
.
bam
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment