fix and test #79

Author: jackbrookes

Assets/UXF/Scripts/Session.cs

@@ -336,7 +336,7 @@ public Block CreateBlock()
         /// <returns></returns>
         public Block CreateBlock(int numberOfTrials)
         {
-            if (numberOfTrials > 0)
+            if (numberOfTrials >= 0)
                 return new Block((uint)numberOfTrials, this);
             else
                 throw new Exception("Invalid number of trials supplied");
@@ -468,24 +468,21 @@ Trial GetFirstTrial()
         /// <returns></returns>
         Trial GetLastTrial()
         {
-            Block lastBlock;
-            try
-            {
-                lastBlock = blocks[blocks.Count - 1];
-            }
-            catch (ArgumentOutOfRangeException)
-            {
-                throw new NoSuchTrialException("There is no last trial because no blocks have been created!");
-            }
+            if (blocks.Count == 0) throw new NoSuchTrialException("There is no last trial because no blocks have been created!");
 
-            try
+            Block lastValidBlock;
+            int i = blocks.Count - 1;
+            while (i >= 0)
             {
-                return lastBlock.trials[lastBlock.trials.Count - 1];
-            }
-            catch (ArgumentOutOfRangeException)
-            {
-                throw new NoSuchTrialException("There is no last trial. No trials exist in the last block.");
+                lastValidBlock = blocks[i];
+                if (lastValidBlock.trials.Count > 0)
+                {
+                    return lastValidBlock.trials[lastValidBlock.trials.Count - 1];
+                }
+                i--;
             }
+
+            throw new NoSuchTrialException("There is no last trial, blocks are present but they are all empty.");
         }
 
         /// <summary>

Assets/UXF/Tests/Editor/TestSessionBuilding.cs

@@ -160,14 +160,46 @@ public void FirstLast()
 			Block block1 = session.CreateBlock(10);
 			Block block2 = session.CreateBlock(10);
 
-			Assert.AreEqual(block1.trials[0], session.FirstTrial);
-			Assert.AreEqual(block2.trials[9], session.LastTrial);
+			Assert.AreEqual(block1.GetRelativeTrial(1), session.FirstTrial);
+			Assert.AreEqual(block2.GetRelativeTrial(10), session.LastTrial);
+
+			// reset blocks
+            session.blocks = new List<Block>();
+		}
+
+
+		[Test]
+		public void GetLastTrialWhenLastBlockEmpty()
+		{
+			Block block1 = session.CreateBlock(10);
+			Block block2 = session.CreateBlock();
+
+			Assert.AreEqual(session.LastTrial, block1.GetRelativeTrial(10));
 
 			// reset blocks
             session.blocks = new List<Block>();
 		}
 
+		[Test]
+		public void GetLastTrialWhenNoTrials()
+		{
+			Block block1 = session.CreateBlock();
+			Block block2 = session.CreateBlock();
+
+			Assert.Throws<NoSuchTrialException>(() => { var a = session.LastTrial; } );
+
+			// reset blocks
+            session.blocks = new List<Block>();
+		}
 
+		[Test]
+		public void GetLastTrialWhenNoBlocks()
+		{
+			Assert.Throws<NoSuchTrialException>(() => { var a = session.LastTrial; } );
+
+			// reset blocks
+            session.blocks = new List<Block>();
+		}
 
 	}
 

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.2.3
+2.2.4