address #51

Author: jackbrookes

Assets/UXF/Scripts/Etc/Trial.cs

@@ -78,6 +78,8 @@ private void SetReferences(Block trialBlock)
         /// </summary>
         public void Begin()
         {
+            if (session.InTrial) session.CurrentTrial.End();
+
             session.currentTrialNum = number;
             session.currentBlockNum = block.number;
 

Assets/UXF/Tests/Editor/TestSessionBehaviour.cs

@@ -81,6 +81,26 @@ public void TestEndMultipleTimes()
             session.End();
         }
 
+        [Test]
+        public void TestCurrentEndTrialOnBeginNext()
+        {
+            (Session session, FileSaver fileSaver) = CreateSession("endonbegin");
+            session.endOnDestroy = true;
+            
+            foreach (var t in session.Trials)
+            {
+                t.Begin();
+            }
+
+            foreach (var t in session.Trials)
+            {
+                TrialStatus expectedStatus = t == session.LastTrial ? TrialStatus.InProgress : TrialStatus.Done;
+                Assert.AreEqual(t.status, expectedStatus);
+            }
+
+            GameObject.DestroyImmediate(session.gameObject);
+        }
+
         Tuple<Session, FileSaver> CreateSession(string ppidExtra)
         {
             GameObject gameObject = new GameObject();

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.0.5
+2.1.0