fix #78 and new tests

Author: jackbrookes

Assets/UXF/Examples/1a_SpaceShuttle/SpaceShuttleExample.unity

@@ -777,12 +777,12 @@ PrefabInstance:
     - target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: storeSessionSettings
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 114916036141644208, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: storeParticipantDetails
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 203569540471596912, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
@@ -997,7 +997,7 @@ PrefabInstance:
     - target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: participantDataPoints.Array.data[0].displayName
-      value: Age
+      value: 34354635463546345
       objectReference: {fileID: 0}
     - target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
@@ -1054,11 +1054,6 @@ PrefabInstance:
       propertyPath: ppidMode
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
-        type: 3}
-      propertyPath: termsAndConditions
-      value: Please tick if you understand the instructions.<color=red>*</color>
-      objectReference: {fileID: 0}
     - target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: participantDataPoints.Array.data[2].displayName
@@ -1099,6 +1094,11 @@ PrefabInstance:
       propertyPath: startupMode
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 653059108743847710, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 3}
+      propertyPath: termsAndConditions
+      value: Please tick if you understand the instructions.<color=red>*</color>
+      objectReference: {fileID: 0}
     - target: {fileID: 759169902625461607, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchorMin.y
@@ -2690,6 +2690,12 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5489284586117691312, guid: 0a3b6392f04558844bd340e68ced1ff9,
+        type: 3}
+      propertyPath: m_Text
+      value: Please tick if you understand the instructions and agree for your data
+        to be collected and used for research purposes.<color=red>*</color>
+      objectReference: {fileID: 0}
     - target: {fileID: 5540555593714305841, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 3}
       propertyPath: m_AnchorMin.y

Assets/UXF/Scripts/Etc/Trial.cs

@@ -78,6 +78,10 @@ private void SetReferences(Block trialBlock)
         /// </summary>
         public void Begin()
         {
+            if (!session.hasInitialised)
+            {
+                throw new InvalidOperationException("Cannot begin trial, session is is not ready! Session has not been started yet with session.Begin() (or via the UI), or session has already ended.");
+            }
             if (session.InTrial) session.CurrentTrial.End();
 
             session.currentTrialNum = number;

Assets/UXF/Scripts/Session.cs

@@ -224,7 +224,7 @@ public class Session : MonoBehaviour, ISettingsContainer, IDataAssociatable
         /// <summary>
         /// Stores combined list of headers for the behavioural output.
         /// </summary>
-        public List<string> Headers { get { return baseHeaders.Concat(settingsToLog).Concat(customHeaders).ToList(); } }
+        public List<string> Headers { get { return baseHeaders.Concat(settingsToLog).Concat(customHeaders).Distinct().ToList(); } }
 
         /// <summary>
         /// Dictionary of objects for datapoints collected via the UI, or otherwise.

Assets/UXF/Tests/Editor/TestSessionBehaviour.cs

@@ -101,6 +101,23 @@ public void TestCurrentEndTrialOnBeginNext()
             GameObject.DestroyImmediate(session.gameObject);
         }
 
+
+        [Test]
+		public void DuplicateHeaders()
+		{
+            (Session session, FileSaver fileSaver) = CreateSession("duplicateheaders");
+
+			session.settingsToLog.Add("hello");
+			session.settingsToLog.Add("hello");
+			session.customHeaders.Add("hello");
+			session.customHeaders.Add("hello");
+
+			session.FirstTrial.Begin();
+			session.FirstTrial.End();
+
+			session.End();
+		}
+
         Tuple<Session, FileSaver> CreateSession(string ppidExtra)
         {
             GameObject gameObject = new GameObject();

Assets/UXF/Tests/Editor/TestSessionBuilding.cs

@@ -167,6 +167,8 @@ public void FirstLast()
             session.blocks = new List<Block>();
 		}
 
+
+		
 	}
 
 }

Assets/UXF/Tests/Editor/TestTrials.cs

@@ -97,6 +97,19 @@ public void RunTrialsAdHocResultsAddEarlyExit()
             Finish(); // check we dont throw an error
         }
 
+        [Test]
+        public void BeginTrialBeforeBeginSession()
+        {
+            gameObject = new GameObject();
+            session = gameObject.AddComponent<Session>();
+
+			// generate trials
+			session.CreateBlock(1);
+
+            Assert.Throws<InvalidOperationException>(() => session.FirstTrial.Begin());
+        }
+
+
         [Test]
         public void WriteCommas()
         {

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.2.1
+2.2.2