fix & test early exit bug with adhoc headers

Author: Jack Brookes

Assets/UXF/Scripts/FileIOManager.cs

@@ -231,7 +231,15 @@ public void WriteTrials(List<ResultsDictionary> dictList, WriteFileInfo writeFil
                 // add all observations to the row, in correct order.
                 // check if null, if so assign to empty string (?? operator)
                 var row = headers
-                    .Select(header => (dict[header] ?? string.Empty).ToString());
+                    .Select(header => 
+                        {
+                            object val;
+                            try { val = dict[header]; }
+                            catch (KeyNotFoundException) { val = string.Empty; }
+                            
+                            return val.ToString();
+                        }
+                    );
 
                 // join to string & store in output
                 csvRows[i + 1] = string.Join(",", row.ToArray());               

Assets/UXF/Scripts/Tests/Editor/TestTrials.cs

@@ -122,6 +122,18 @@ public void RunTrialsAdHocResultsAdd()
             Assert.AreEqual("directory,experiment,ppid,session_num,trial_num,block_num,trial_num_in_block,start_time,end_time,observation,null_observation,not_customheader_observation", firstLine);           
         }
 
+        [Test]
+        public void RunTrialsAdHocResultsAddEarlyExit()
+        {   
+            Start(true);
+            session.blocks[0].trials[0].Begin();
+            session.blocks[0].trials[0].result["not_customheader_observation"] = "something";
+            session.blocks[0].trials[0].End();
+            
+            session.blocks[0].trials[1].Begin();
+            Finish(); // check we dont throw an error
+        }
+
 	}
 
 }