diff --git a/unittests/eln_cfood.yaml b/unittests/eln_cfood.yaml index ab8e7108f511b0450d37c3e60162e412d4a1bf3b..bb29b7da7c1e6c3fc555038412f42ff2ab4d28fa 100644 --- a/unittests/eln_cfood.yaml +++ b/unittests/eln_cfood.yaml @@ -26,11 +26,18 @@ DataDir: "@id": records-example/$ name: (?P<name>.*) keywords: (?P<keywords>.*) - description: (?P<description>.*) dateModified: (?P<dateModified>.*) records: Dataset: name: $name keywords: $keywords - description: $description dateModified: $dateModified + subtree: + Description: + type: ROCrateEntity + match_type: TextObject + match_properties: + text: (?P<description>.*) + records: + Dataset: + description: $description diff --git a/unittests/test_rocrate_converter.py b/unittests/test_rocrate_converter.py index 02f0f6025b3e8168e26c8e6367c37240ea28af35..4b6bde171c789017e95a38729ae93f49ecf3f97b 100644 --- a/unittests/test_rocrate_converter.py +++ b/unittests/test_rocrate_converter.py @@ -213,12 +213,6 @@ def test_scanner(): assert rlist[0].get_property("dateModified").value == "2024-08-21T11:43:17.626965+00:00" -@pytest.mark.xfail( - reason="The description is no longer a simple string, but a reference to another record." - "The rocrate converter will be able to dereference this as soon as this feature is implemented:" - "https://gitlab.indiscale.com/caosdb/src/caosdb-crawler/-/issues/191" - "This test might need changes in the yaml definition." -) def test_description_reference(): rlist = scanner.scan_directory(os.path.join(UNITTESTDIR, "eln_files/"), os.path.join(UNITTESTDIR, "eln_cfood.yaml"))