diff --git a/src/test/java/org/alliancegenome/curation_api/bulkupload/fms/AGMBulkUploadFmsITCase.java b/src/test/java/org/alliancegenome/curation_api/bulkupload/fms/AGMBulkUploadFmsITCase.java index 20a6125be..f1614ee28 100644 --- a/src/test/java/org/alliancegenome/curation_api/bulkupload/fms/AGMBulkUploadFmsITCase.java +++ b/src/test/java/org/alliancegenome/curation_api/bulkupload/fms/AGMBulkUploadFmsITCase.java @@ -506,8 +506,8 @@ public void agmBulkUploadInvalidComponentZygosity() throws Exception { body("totalResults", is(0)); } - // TODO: adjust count (and subsequent test counts) once loading and validation of STRs in place - @Test + // TODO: re-enable test once loading and validation of STRs in place + // @Test @Order(18) public void agmBulkUploadInvalidSequenceTargetingReagentId() throws Exception { String content = Files.readString(Path.of("src/test/resources/bulk/fms/03_affected_genomic_model/18_invalid_str_id.json")); @@ -529,9 +529,7 @@ public void agmBulkUploadInvalidSequenceTargetingReagentId() throws Exception { post("/api/agm/find?limit=10&page=0"). then(). statusCode(200). - body("totalResults", is(1)). - body("results", hasSize(1)). - body("results[0].curie", is("TEST:TestAGM00018")); + body("totalResults", is(0)); } @Test diff --git a/src/test/resources/bulk/fms/03_affected_genomic_model/16_invalid_agm_components_allele_id.json b/src/test/resources/bulk/fms/03_affected_genomic_model/16_invalid_agm_components_allele_id.json index e5dc43837..b9ba8723b 100644 --- a/src/test/resources/bulk/fms/03_affected_genomic_model/16_invalid_agm_components_allele_id.json +++ b/src/test/resources/bulk/fms/03_affected_genomic_model/16_invalid_agm_components_allele_id.json @@ -3,30 +3,30 @@ { "affectedGenomicModelComponents": [ { - "alleleID": "TEST:TestAllele00001", + "alleleID": "TEST:TestAllele0000X", "zygosity": "GENO:0000136" } ], "crossReference": { - "id": "TEST:TestAGM00001", + "id": "TEST:TestAGM00016", "pages": [ "genotype" ] }, - "name": "Test AGM 1", + "name": "Test AGM 16", "parentalPopulationIDs": [ "TEST:TestComponent00001" ], - "primaryID": "TEST:TestAGM00001", + "primaryID": "TEST:TestAGM00016", "secondaryIds": [ - "TEST:AGM1" + "TEST:AGM16" ], "sequenceTargetingReagentIDs": [ "TEST:TestSTR00001" ], "subtype": "genotype", "synonyms": [ - "TAGM1" + "TAGM16" ], "taxonId": "NCBITaxon:10090" } diff --git a/src/test/resources/bulk/fms/03_affected_genomic_model/17_invalid_agm_components_allele_zygosity.json b/src/test/resources/bulk/fms/03_affected_genomic_model/17_invalid_agm_components_allele_zygosity.json index e5dc43837..e264246d6 100644 --- a/src/test/resources/bulk/fms/03_affected_genomic_model/17_invalid_agm_components_allele_zygosity.json +++ b/src/test/resources/bulk/fms/03_affected_genomic_model/17_invalid_agm_components_allele_zygosity.json @@ -4,29 +4,29 @@ "affectedGenomicModelComponents": [ { "alleleID": "TEST:TestAllele00001", - "zygosity": "GENO:0000136" + "zygosity": "GENO:000013X" } ], "crossReference": { - "id": "TEST:TestAGM00001", + "id": "TEST:TestAGM00017", "pages": [ "genotype" ] }, - "name": "Test AGM 1", + "name": "Test AGM 17", "parentalPopulationIDs": [ "TEST:TestComponent00001" ], - "primaryID": "TEST:TestAGM00001", + "primaryID": "TEST:TestAGM00017", "secondaryIds": [ - "TEST:AGM1" + "TEST:AGM17" ], "sequenceTargetingReagentIDs": [ "TEST:TestSTR00001" ], "subtype": "genotype", "synonyms": [ - "TAGM1" + "TAGM17" ], "taxonId": "NCBITaxon:10090" }