better post session event handling

Author: jackbrookes

Assets/UXF/Scripts/Session.cs

@@ -29,6 +29,12 @@ public class Session : MonoBehaviour
         [Tooltip("Enable to automatically safely end the session when this object is destroyed.")]
         public bool endOnDestroy = true;
 
+        /// <summary>
+        /// Enable to automatically end the session when the final trial has ended.
+        /// </summary>
+        [Tooltip("Enable to automatically end the session when the final trial has ended.")]
+        public bool endAfterLastTrial = true;
+
         /// <summary>
         /// List of blocks for this experiment
         /// </summary>
@@ -640,13 +646,14 @@ public void End()
                 // end FileIOManager - forces immediate writing of all files
                 fileIOManager.End();
 
+                onSessionEnd.Invoke(this);
+
                 currentTrialNum = 0;
                 currentBlockNum = 0;
                 blocks = new List<Block>();
                 _hasInitialised = false;
 
                 Debug.Log("Ended session.");
-                onSessionEnd.Invoke(this);
             }
         }
 

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

@@ -0,0 +1,95 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.TestTools;
+using NUnit.Framework;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace UXF.Tests
+{
+
+	public class TestEvents
+	{
+
+        GameObject gameObject;
+        Session session;
+        FileIOManager fileIOManager;
+        SessionLogger sessionLogger;
+
+        [SetUp]
+        public void SetUp()
+        {
+            
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+
+        }
+
+        [Test]
+        public void SessionEndEvent()
+        {   
+
+            gameObject = new GameObject();
+            fileIOManager = gameObject.AddComponent<FileIOManager>();
+            sessionLogger = gameObject.AddComponent<SessionLogger>();
+            session = gameObject.AddComponent<Session>();
+
+            session.AttachReferences(
+                fileIOManager
+            );
+
+            sessionLogger.AttachReferences(
+                fileIOManager,
+                session
+            );
+
+            session.onSessionEnd.AddListener(UseSession);
+
+            sessionLogger.Initialise();
+
+            fileIOManager.debug = true;
+            fileIOManager.Begin();
+
+            string experimentName = "unit_test";
+            string ppid = "test_trials";
+            session.Begin(experimentName, ppid, "example_output");
+            session.customHeaders.Add("observation");
+
+			// generate trials
+			session.CreateBlock(2);
+            session.CreateBlock(3);
+
+            int i = 0;
+            foreach (var trial in session.Trials)
+            {
+                trial.Begin();
+                trial.result["observation"] = ++i;
+                trial.End();
+            }
+
+            session.End();
+
+
+
+
+        }
+
+
+        void UseSession(UXF.Session session)
+        {
+            int i = 0;
+            foreach (var trial in session.Trials)
+            {
+                Assert.AreEqual(trial.result["observation"], ++i);
+            }
+        }
+
+
+	}
+
+}

Assets/UXF/Scripts/Tests/Editor/TestEvents.cs.meta

@@ -67,6 +67,15 @@ public static void Shuffle<T>(this IList<T> list)
             list.Shuffle(rng);
         }
 
+        /// <summary>
+        /// Swaps the order of the elements at indeces `indexA` and `indexB` within `list`
+        /// </summary>
+        public static void Swap<T>(IList<T> list, int indexA, int indexB)
+        {
+            T tmp = list[indexA];
+            list[indexA] = list[indexB];
+            list[indexB] = tmp;
+        }
 
         /// <summary>
         /// Combine many path parts into a single path.