Skip to content

Commit

Permalink
fixing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jemten committed Oct 5, 2023
1 parent 2064b4f commit 0f1e54f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 7 deletions.
3 changes: 3 additions & 0 deletions 643594-miptest_metrics_deliverables.yaml
@@ -0,0 +1,3 @@
---
metrics: []

2 changes: 1 addition & 1 deletion definitions/rd_dna_panel_parameters.yaml
Expand Up @@ -1183,7 +1183,7 @@ qccollect_eval_metric_file:
associated_recipe:
- qccollect_ar
data_type: SCALAR
default: qc_eval_metric_-v1.3-.yaml
default: qc_eval_metric_-v1.4-.yaml
exists_check: file
is_reference: 1
reference: reference_dir
Expand Down
2 changes: 1 addition & 1 deletion definitions/rd_dna_parameters.yaml
Expand Up @@ -2309,7 +2309,7 @@ qccollect_eval_metric_file:
associated_recipe:
- qccollect_ar
data_type: SCALAR
default: qc_eval_metric_-v1.3-.yaml
default: qc_eval_metric_-v1.4-.yaml
exists_check: file
is_reference: 1
reference: reference_dir
Expand Down
2 changes: 1 addition & 1 deletion definitions/rd_rna_parameters.yaml
Expand Up @@ -1095,7 +1095,7 @@ qccollect_eval_metric_file:
associated_recipe:
- qccollect_ar
data_type: SCALAR
default: qc_eval_metric_-v1.3-.yaml
default: qc_eval_metric_-v1.4-.yaml
exists_check: file
is_reference: 1
reference: reference_dir
Expand Down
Expand Up @@ -28,6 +28,8 @@ wgs:
collectmultiplemetrics:
PCT_PF_READS_ALIGNED:
lt: 0.95
PCT_PF_READS_IMPROPER_PAIRS:
gt: 0.05
PCT_ADAPTER:
gt: 0.0005
markduplicates:
Expand Down
13 changes: 10 additions & 3 deletions t/define_evaluate_metric.t
Expand Up @@ -47,8 +47,9 @@ diag( q{Test define_evaluate_metric from Qccollect.pm}
. $SPACE
. $EXECUTABLE_NAME );

Readonly my $PCT_ADAPTER => 0.0005;
Readonly my $PCT_PF_READS_ALIGNED => 0.95;
Readonly my $PCT_ADAPTER => 0.0005;
Readonly my $PCT_PF_READS_ALIGNED => 0.95;
Readonly my $PCT_PF_READS_IMPROPER_PAIRS => 0.05;

my $log = test_log( { no_screen => 1, } );

Expand All @@ -59,7 +60,7 @@ my %sample_info = test_mip_hashes(
);

## Given a file with evaluation metrics
my $eval_metric_file = catfile( dirname($Bin), qw{ t data references qc_eval_metric_-v1.3-.yaml} );
my $eval_metric_file = catfile( dirname($Bin), qw{ t data references qc_eval_metric_-v1.4-.yaml} );

## When defining the evaluation metrics based on the analysis
my %evaluate_metric = define_evaluate_metric(
Expand All @@ -83,6 +84,9 @@ my %expected = (
PCT_PF_READS_ALIGNED => {
lt => $PCT_PF_READS_ALIGNED,
},
PCT_PF_READS_IMPROPER_PAIRS => {
gt => $PCT_PF_READS_IMPROPER_PAIRS,
},
},
},
ADM1059A2 => {
Expand All @@ -98,6 +102,9 @@ my %expected = (
PCT_PF_READS_ALIGNED => {
lt => $PCT_PF_READS_ALIGNED,
},
PCT_PF_READS_IMPROPER_PAIRS => {
gt => $PCT_PF_READS_IMPROPER_PAIRS,
},
},
},
ADM1059A3 => {
Expand Down
2 changes: 1 addition & 1 deletion t/evaluate_analysis.t
Expand Up @@ -69,7 +69,7 @@ my %sample_info = test_mip_hashes(
}
);

my $eval_metric_file = catfile( dirname($Bin), qw{ t data references qc_eval_metric_-v1.3-.yaml} );
my $eval_metric_file = catfile( dirname($Bin), qw{ t data references qc_eval_metric_-v1.4-.yaml} );

## Then set the relevant evaluation metrics for the analysis
my $is_ok = evaluate_analysis(
Expand Down

0 comments on commit 0f1e54f

Please sign in to comment.