Commit 309037a6 authored by Ivo Fokkema's avatar Ivo Fokkema

Finally figured out what was breaking the tests; apparently something our...

Finally figured out what was breaking the tests; apparently something our tested PHP versions don't have.
- Fixed parse error in object_phenotypes.php.
- Re-enabled all tests.
parent e87fe05a
......@@ -4,7 +4,7 @@
* LEIDEN OPEN VARIATION DATABASE (LOVD)
*
* Created : 2011-02-16
* Modified : 2019-08-28
* Modified : 2019-09-04
* For LOVD : 3.0-22
*
* Copyright : 2004-2019 Leiden University Medical Center; http://www.LUMC.nl/
......@@ -45,7 +45,7 @@ require_once ROOT_PATH . 'class/object_custom.php';
class LOVD_Phenotype extends LOVD_Custom {
// This class extends the basic Object class and it handles the Link object.
var $sObject = 'Phenotype';
var $bShared = (LOVD_plus? false : true);
var $bShared = true;
......@@ -54,7 +54,11 @@ class LOVD_Phenotype extends LOVD_Custom {
function __construct ($sObjectID = '', $nID = '')
{
// Default constructor.
global $_AUTH;
if (LOVD_plus) {
// We don't have shared custom columns in LOVD+.
$this->bShared = false;
}
// SQL code for loading an entry for an edit form.
// FIXME; change owner to owned_by_ in the load entry query below.
......
......@@ -4,7 +4,7 @@
* LEIDEN OPEN VARIATION DATABASE (LOVD)
*
* Created : 2011-05-12
* Modified : 2019-08-28
* Modified : 2019-09-04
* For LOVD : 3.0-22
*
* Copyright : 2004-2019 Leiden University Medical Center; http://www.LUMC.nl/
......@@ -61,7 +61,10 @@ class LOVD_TranscriptVariant extends LOVD_Custom {
// Default constructor.
global $_DB;
$this->bShared = (LOVD_plus? false : true);
if (LOVD_plus) {
// We don't have shared custom columns in LOVD+.
$this->bShared = false;
}
// SQL code for loading an entry for an edit form.
$this->sSQLLoadEntry = 'SELECT vot.* ' .
......
......@@ -11,14 +11,14 @@
<file>shared_tests/create_disease_IVA.php</file>
<file>shared_tests/convert_LOVD2_export_IVD.php</file>
<file>admin_tests/create_individual_diagnosed_with_Healthy_Control.php</file>
<!-- <file>admin_tests/add_phenotype_info_to_healthy_individual.php</file> -->
<file>admin_tests/add_phenotype_info_to_healthy_individual.php</file>
<file>admin_tests/add_screening_to_healthy_individual.php</file>
<file>admin_tests/add_variant_located_within_gene_to_healthy_individual.php</file>
<file>admin_tests/add_seatlleseq_file_to_healthy_individual.php</file>
<file>admin_tests/add_variant_only_described_on_genomic_level_to_healthy_individual.php</file>
<file>admin_tests/finish_individual_diagnosed_healthy.php</file>
<file>admin_tests/create_individual_diagnosed_with_IVA.php</file>
<!-- <file>admin_tests/add_phenotype_info_to_IVA_individual.php</file> -->
<file>admin_tests/add_phenotype_info_to_IVA_individual.php</file>
<file>admin_tests/add_screening_to_IVA_individual.php</file>
<file>admin_tests/add_variant_located_within_gene_to_IVA_individual.php</file>
<file>admin_tests/add_variant_only_described_on_genomic_level_to_IVA_individual.php</file>
......@@ -32,7 +32,7 @@
<file>admin_tests/post_finish_add_variant_only_described_on_genomic_level_to_IVA_individual.php</file>
<file>admin_tests/post_finish_add_variant_located_within_gene_to_IVA_individual.php</file>
<file>admin_tests/post_finish_add_screening_to_IVA_individual.php</file>
<!-- <file>admin_tests/post_finish_add_phenotype_info_to_IVA_individual.php</file> -->
<file>admin_tests/post_finish_add_phenotype_info_to_IVA_individual.php</file>
<file>shared_tests/test_create_token.php</file>
<file>shared_tests/test_submission_api_fail.php</file>
<file>shared_tests/test_submission_api_success.php</file>
......@@ -40,7 +40,7 @@
<file>admin_tests/multi_value_search.php</file>
<file>shared_tests/uninstall_LOVD.php</file>
</testsuite>
<!-- <testsuite name="authorization_tests">
<testsuite name="authorization_tests">
<file>shared_tests/install_LOVD.php</file>
<file>shared_tests/create_user_manager.php</file>
<file>shared_tests/create_user_curator.php</file>
......@@ -57,7 +57,7 @@
<file>authorization_tests/make_user_collaborator_IVD.php</file>
<file>authorization_tests/authorization.php</file>
<file>shared_tests/uninstall_LOVD.php</file>
</testsuite> -->
</testsuite>
<testsuite name="collaborator_tests">
<file>shared_tests/install_LOVD.php</file>
<file>shared_tests/create_gene_GJB.php</file>
......@@ -67,7 +67,7 @@
<file>collaborator_tests/create_user_submitter.php</file>
<file>collaborator_tests/create_disease_CMT.php</file>
<file>collaborator_tests/create_individual_diagnosed_with_CMT.php</file>
<!-- <file>collaborator_tests/add_phenotype_info_to_CMT_individual.php</file> -->
<file>collaborator_tests/add_phenotype_info_to_CMT_individual.php</file>
<file>collaborator_tests/add_screening_to_CMT_individual.php</file>
<file>collaborator_tests/add_variant_located_within_gene_to_CMT_individual.php</file>
<file>collaborator_tests/add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
......@@ -84,7 +84,7 @@
<file>collaborator_tests/post_finish_add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
<file>collaborator_tests/post_finish_add_variant_located_within_gene_to_CMT_individual.php</file>
<file>collaborator_tests/post_finish_add_screening_to_CMT_individual.php</file>
<!-- <file>collaborator_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file> -->
<file>collaborator_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file>
<file>collaborator_tests/delete_gene_GJB.php</file>
<file>shared_tests/uninstall_LOVD.php</file>
</testsuite>
......@@ -99,7 +99,7 @@
<file>curator_tests/create_user_submitter.php</file>
<file>curator_tests/create_disease_CMT.php</file>
<file>curator_tests/create_individual_diagnosed_with_CMT.php</file>
<!-- <file>curator_tests/add_phenotype_info_to_CMT_individual.php</file> -->
<file>curator_tests/add_phenotype_info_to_CMT_individual.php</file>
<file>curator_tests/add_screening_to_CMT_individual.php</file>
<file>curator_tests/add_variant_located_within_gene_to_CMT_individual.php</file>
<file>curator_tests/add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
......@@ -114,7 +114,7 @@
<file>curator_tests/post_finish_add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
<file>curator_tests/post_finish_add_variant_located_within_gene_to_CMT_individual.php</file>
<file>curator_tests/post_finish_add_screening_to_CMT_individual.php</file>
<!-- <file>curator_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file> -->
<file>curator_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file>
<file>curator_tests/delete_gene_GJB.php</file>
<file>shared_tests/uninstall_LOVD.php</file>
</testsuite>
......@@ -129,7 +129,7 @@
<file>manager_tests/make_user_curator_GJB.php</file>
<file>manager_tests/create_disease_CMT.php</file>
<file>manager_tests/create_individual_diagnosed_with_CMT.php</file>
<!-- <file>manager_tests/add_phenotype_info_to_CMT_individual.php</file> -->
<file>manager_tests/add_phenotype_info_to_CMT_individual.php</file>
<file>manager_tests/add_screening_to_CMT_individual.php</file>
<file>manager_tests/add_variant_located_within_gene_to_CMT_individual.php</file>
<file>manager_tests/add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
......@@ -144,7 +144,7 @@
<file>manager_tests/post_finish_add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
<file>manager_tests/post_finish_add_variant_located_within_gene_to_CMT_individual.php</file>
<file>manager_tests/post_finish_add_screening_to_CMT_individual.php</file>
<!-- <file>manager_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file> -->
<file>manager_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file>
<file>manager_tests/delete_gene_GJB.php</file>
<file>manager_tests/test_block_submitter_registration.php</file>
<file>manager_tests/create_announcement_readonly.php</file>
......@@ -174,7 +174,7 @@
<file>submitter_tests/create_user_submitter2.php</file>
<file>submitter_tests/create_disease_CMT.php</file>
<file>submitter_tests/create_individual_diagnosed_with_CMT.php</file>
<!-- <file>submitter_tests/add_phenotype_info_to_CMT_individual.php</file> -->
<file>submitter_tests/add_phenotype_info_to_CMT_individual.php</file>
<file>submitter_tests/add_screening_to_CMT_individual.php</file>
<file>submitter_tests/add_variant_located_within_gene_to_CMT_individual.php</file>
<file>submitter_tests/add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
......@@ -191,7 +191,7 @@
<file>submitter_tests/post_finish_add_variant_only_described_on_genomic_level_to_CMT_individual.php</file>
<file>submitter_tests/post_finish_add_variant_located_within_gene_to_CMT_individual.php</file>
<file>submitter_tests/post_finish_add_screening_to_CMT_individual.php</file>
<!-- <file>submitter_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file> -->
<file>submitter_tests/post_finish_add_phenotype_info_to_CMT_individual.php</file>
<file>submitter_tests/delete_gene_GJB.php</file>
<file>shared_tests/uninstall_LOVD.php</file>
</testsuite>
......
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