Reviewed AddColumnFill member function and tests

#399 Issue
nfdi4plants · Jul 26, 2024 · df0bda9 · df0bda9
1 parent e68ca44
commit df0bda9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 29 deletions.
diff --git a/src/Core/Table/ArcTable.fs b/src/Core/Table/ArcTable.fs
@@ -181,6 +181,7 @@ type ArcTable(name: string, headers: ResizeArray<CompositeHeader>, values: Syste
             newTable.AddColumn(header, ?cells = cells, ?index = index, ?forceReplace = forceReplace)
             newTable
 
+    /// Adds a new column which fills in the single given value for the length of the table.
     member this.AddColumnFill (header: CompositeHeader, cell: CompositeCell, ?index: int ,?forceReplace : bool) =  
         let cells = Array.init this.RowCount (fun _ -> cell.Copy())    
         this.AddColumn(header, cells = cells, ?index = index,  ?forceReplace = forceReplace)     

diff --git a/tests/Core/ArcTable.Tests.fs b/tests/Core/ArcTable.Tests.fs
@@ -1624,44 +1624,40 @@ let private tests_AddColumns =
     ]
 
 
-//New Test for AddColumnFill
+//Test for AddColumnFill
 let private tests_AddColumnFill = 
     testList "AddColumnFill" [ 
-        testCase "addColumnFill to preexisting table with rows" (fun () ->  // AddColumnFill to Table with Rows // 
-            let table = create_testTable()
-            let expectedValue = CompositeCell.createUnitizedFromString("1")
-            table.AddColumnFill(CompositeHeader.Parameter (OntologyAnnotation("chlamy_r")), expectedValue) //or .createTermfromString
+        let table = create_testTable()
+        let inputHeader = CompositeHeader.Parameter (OntologyAnnotation("chlamy_r"))
+        let cellU = CompositeCell.createUnitizedFromString("1")
+        testCase "addColumnFill to preexisting table with rows" (fun () -> 
+            table.AddColumnFill(inputHeader, cellU)
             Expect.equal table.ColumnCount 6 "ColumnCount"
             Expect.equal table.RowCount 5 "RowCount"
             let columnIndex = table.ColumnCount - 1
-            let getactualValue rowIndex  = table.Values.[columnIndex,rowIndex]
-            for ri in 0 .. table.RowCount - 1 do 
-                let value = getactualValue ri 
-                Expect.equal value expectedValue $"RowIndex: {ri}"
-        )
-        testCase "addColumnFill to empty table" (fun () -> // "Empty Table" fail if empty flag at least RowCount 1 if table empty etc
-            let table = ArcTable.init(name = "EmptyTable")
-            let expectedValue = CompositeCell.createUnitizedFromString("1")
-            table.AddColumnFill(CompositeHeader.Parameter (OntologyAnnotation("chlamy_r")), expectedValue) 
-            Expect.equal table.ColumnCount 1 "ColumnCount"
-            Expect.equal table.RowCount 0 "RowCount"            
-            let content = table.Values.Values 
+            for ri in 0 .. table.RowCount - 1 do
+                let value = table.Values.[(columnIndex, ri)]
+                Expect.equal value cellU $"Value at column {columnIndex}, row {ri} should be equal to the input cellU"
+        )
+        testCase "addColumnFill to empty table" (fun () -> 
+            let emptyTable = ArcTable.init(name = "EmptyTable")
+            emptyTable.AddColumnFill(inputHeader, cellU) 
+            Expect.equal emptyTable.ColumnCount 1 "ColumnCount"
+            Expect.equal emptyTable.RowCount 0 "RowCount"            
+            let content = emptyTable.Values.Values 
             Expect.isEmpty content "Cannot add column to empty table"
         )
-        testCase "mutability test" (fun () ->  // Update single cell compositeCell all exepct freeText cosnequences (mutability test)
-            let table = create_testTable()
-            let expectedValue = CompositeCell.createTermFromString("1")
-            table.AddColumnFill(CompositeHeader.Parameter (OntologyAnnotation("chlamy_r")), expectedValue, index = 2) 
+        testCase "mutability test" (fun () ->  
+            let cell = CompositeCell.createTermFromString("1")
+            table.AddColumnFill(inputHeader, cell, index = 2) 
             table.Values.[2,0].AsTerm.Name <- Some "2" 
-            let changedValue = table.Values.[(2, 0)]
-            let unaffectedValues = [ for ri in 1 .. table.RowCount - 1 -> table.Values.[(2, ri)] ]
-            for value in unaffectedValues do
-                Expect.notEqual value changedValue "Other cells should remain unchanged"
+            let changedCell = table.Values.[(2, 0)]
+            let unaffectedCell = [ for ri in 1 .. table.RowCount - 1 -> table.Values.[(2, ri)] ]
+            for el in unaffectedCell do
+                Expect.notEqual el changedCell "Other cells should remain unchanged"
         )
-        testCase "CheckBoundaries" (fun () ->  // Check boundaries test if fail if out of range indices AddColumn index 10 ex
-            let table = create_testTable()
-            let expectedValue = CompositeCell.createUnitizedFromString("1")
-            let newTable() = table.AddColumnFill(CompositeHeader.Parameter (OntologyAnnotation("chlamy_r")), expectedValue, index = 10)
+        testCase "checkBoundaries" (fun () ->  
+            let newTable() = table.AddColumnFill(inputHeader, cellU, index = 10)
             Expect.throws newTable "Should fail with index 10"
         )
     ]