diff --git a/tests/ARCTokenization.Tests/IntegrationTests/AssayMetadata.fs b/tests/ARCTokenization.Tests/IntegrationTests/AssayMetadata.fs index d0b78f7..0d7e5ed 100644 --- a/tests/ARCTokenization.Tests/IntegrationTests/AssayMetadata.fs +++ b/tests/ARCTokenization.Tests/IntegrationTests/AssayMetadata.fs @@ -32,12 +32,12 @@ module AssayMetadata = [] let ``Simple study is parsed from filepath CvParam with all structural ontology terms in order`` () = - let fakePath = CvParam(cvTerm = AFSO.``File Path``, v = "Fixtures/correct/assay_simple.xlsx") + let fakePath = CvParam(cvTerm = AFSO.``Assay File``, v = "assays/measurement1/isa.assay.xlsx") + let rootDir = (System.IO.Path.GetFullPath("Fixtures/arcStructure/")) let actual = [fakePath] |> Assay.parseMetadataSheetsFromTokens( - FileName = "assay_simple.xlsx" - ) + ) rootDir |> Seq.head Assert.All((List.zip allExpectedMetadataTermsFull actual), (fun (expected,actual) -> CvParam.structuralEquality (expected) (actual :?> CvParam) diff --git a/tests/ARCTokenization.Tests/IntegrationTests/InvestigationMetadata.fs b/tests/ARCTokenization.Tests/IntegrationTests/InvestigationMetadata.fs index e198d0a..f4b0002 100644 --- a/tests/ARCTokenization.Tests/IntegrationTests/InvestigationMetadata.fs +++ b/tests/ARCTokenization.Tests/IntegrationTests/InvestigationMetadata.fs @@ -11,7 +11,7 @@ module InvestigationMetadata = open TestUtils let parsedInvestigationMetadataEmpty = Investigation.parseMetadataSheetFromFile() "Fixtures/incorrect/investigation_empty.xlsx" - let parsedInvestigationMetadataSimple = Investigation.parseMetadataSheetFromFile() "Fixtures/correct/investigation_simple.xlsx" + let parsedInvestigationMetadataSimple = Investigation.parseMetadataSheetFromFile() "Fixtures/correct/isa.investigation.xlsx" let allExpectedMetadataTermsEmpty = Terms.InvestigationMetadata.nonObsoleteNonRootCvTerms @@ -61,12 +61,11 @@ module InvestigationMetadata = [] let ``Simple investigation is parsed from filepath CvParam with all structural ontology terms in order`` () = - let fakePath = CvParam(cvTerm = AFSO.``File Path``, v = "Fixtures/correct/investigation_simple.xlsx") + let fakePath = CvParam(cvTerm = AFSO.``Investigation File``, v = "isa.investigation.xlsx") + let rootDir = (System.IO.Path.GetFullPath("Fixtures/arcStructure/")) let actual = - [fakePath] - |> Investigation.parseMetadataSheetsFromTokens( - FileName = "investigation_simple.xlsx" - ) + Investigation.parseMetadataSheetsFromTokens( + ) rootDir [fakePath] |> Seq.head Assert.All((List.zip allExpectedMetadataTermsFull actual), (fun (expected,actual) -> diff --git a/tests/ARCTokenization.Tests/IntegrationTests/StudyMetadata.fs b/tests/ARCTokenization.Tests/IntegrationTests/StudyMetadata.fs index 3404ab4..379d94f 100644 --- a/tests/ARCTokenization.Tests/IntegrationTests/StudyMetadata.fs +++ b/tests/ARCTokenization.Tests/IntegrationTests/StudyMetadata.fs @@ -27,12 +27,12 @@ module StudyMetadata = [] let ``Simple study is parsed from filepath CvParam with all structural ontology terms in order`` () = - let fakePath = CvParam(cvTerm = AFSO.``File Path``, v = "Fixtures/correct/study_simple.xlsx") + let fakePath = CvParam(cvTerm = AFSO.``Study File``, v = "studies/experiment1_material/isa.study.xlsx") + let rootDir = (System.IO.Path.GetFullPath("Fixtures/arcStructure/")) let actual = [fakePath] |> Study.parseMetadataSheetsFromTokens( - FileName = "study_simple.xlsx" - ) + ) rootDir |> Seq.head Assert.All((List.zip allExpectedMetadataTermsFull actual), (fun (expected,actual) -> CvParam.structuralEquality (expected) (actual :?> CvParam)