fix merge inconsistencies

nfdi4plants · Sep 18, 2023 · f812f4c · f812f4c
1 parent 03f1dd2
commit f812f4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ARCtrl/ARCtrl.fs b/src/ARCtrl/ARCtrl.fs
@@ -257,7 +257,7 @@ type ARC(?isa : ISA.ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSyste
 
         let registeredAssays =     
             registeredStudies
-            |> Array.map (fun s -> s.Assays.ToArray()) // to-do: s.RegisteredAssays
+            |> Array.map (fun s -> s.RegisteredAssays.ToArray()) // to-do: s.RegisteredAssays
             |> Array.concat
 
         let includeRootFiles : Set<string> = 

diff --git a/tests/ARCtrl/ARCtrl.Tests.fs b/tests/ARCtrl/ARCtrl.Tests.fs
@@ -315,9 +315,9 @@ let private ``payload_file_filters`` =
         studyTable.AppendColumn(CompositeHeader.FreeText "Some File", [|CompositeCell.createFreeText "xd/some_file_that_lies_in_slashxd.txt"|])
         studyTable.AppendColumn(CompositeHeader.ProtocolREF, [|CompositeCell.createFreeText "study_protocol.pdf"|])
         studyTable.AppendColumn(CompositeHeader.Output (IOType.RawDataFile), [|CompositeCell.createFreeText "registered_study_output.txt"|])
-        study.AddAssay(assay)
+        study.AddRegisteredAssay(assay)
 
-        inv.AddStudy(study)
+        inv.AddRegisteredStudy(study)
 
         let fs = 
             Folder("root",[|