improved testing

Author: jackbrookes

Assets/UXF/Examples/Basic/BasicExample.unity

@@ -269,7 +269,7 @@ Prefab:
     - target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 2}
       propertyPath: m_SizeDelta.y
-      value: 75
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 224546371281550106, guid: 0a3b6392f04558844bd340e68ced1ff9,
         type: 2}

Assets/UXF/Scripts/FileIOManager.cs

@@ -52,12 +52,11 @@ void Update()
 
         /// <summary>
         /// Adds a new command to a queue which is executed in a separate worker thread when it is available.
+        /// Warning: The Unity Engine API is not thread safe, so do not attempt to put any Unity commands here.
         /// </summary>
         /// <param name="command"></param>
         public void ManageInWorker(System.Action action)
         {
-            if (debug)
-                Debug.LogFormat("Managing action: {0}.{1}", action.Method.ReflectedType.FullName, action.Method.Name);
 
             if (quitting)
             {
@@ -75,9 +74,16 @@ public void ManageInWorker(System.Action action)
 
         void Worker()
         {
+            if (debug)
+                Debug.Log("Started worker thread");
+
             // performs FileIO tasks in seperate thread
             foreach (var action in bq)
             {
+
+                if (debug && action != null)
+                    Debug.LogFormat("Managing action: {0}.{1}", action.Method.ReflectedType.FullName, action.Method.Name);
+
                 try
                 {
                     action.Invoke();
@@ -206,14 +212,16 @@ void ManageInMain()
 
         void OnDestroy()
         {
-            Quit();
+            End();
         } 
 
         /// <summary>
         /// Aborts the FileIOManager's thread.
         /// </summary>
-        public void Quit()
+        public void End()
         {
+            if (debug)
+                Debug.Log("Joining FileIOManagerThread");
             quitting = true;
             t.Join();
         }

Assets/UXF/Scripts/CSVReader/Tests.meta renamed to Assets/UXF/Scripts/Tests.meta

@@ -0,0 +1,73 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEngine.TestTools;
+using System.Collections.Generic;
+using NUnit.Framework;
+using System.Collections;
+
+namespace UXF.Tests
+{
+
+    public class TestFileIOManager
+    {
+
+        string path = "example_output/fileiomanager_test";
+		FileIOManager fileIOManager;
+
+        [SetUp]
+        public void SetUp()
+        {
+			var gameObject = new GameObject();
+			fileIOManager = gameObject.AddComponent<FileIOManager>();
+			fileIOManager.debug = true;
+			
+        }
+
+
+		[TearDown]
+		public void TearDown()
+		{			
+			GameObject.DestroyImmediate(fileIOManager.gameObject);
+		}
+
+
+        [Test]
+        public void WriteManyFiles()
+        {
+            fileIOManager.Begin();
+
+            // generate a large dictionary
+			var dict = new Dictionary<string, object>();
+
+            var largeArray = new int[10000];
+			for (int i = 0; i < largeArray.Length; i++)
+                largeArray[i] = i;
+
+			dict["large_array"] = largeArray;
+
+            
+            if (!System.IO.Directory.Exists(path))
+                System.IO.Directory.CreateDirectory(path);
+
+
+			// write lots of JSON files
+			int n = 100;
+			for (int i = 0; i < n; i++)
+			{
+				string fileName = System.IO.Path.Combine(path, string.Format("{0:000}.json", i));
+				Debug.LogFormat("Queueing {0}", fileName);
+            	fileIOManager.ManageInWorker(() => fileIOManager.WriteJson(fileName, dict));
+			}
+
+            fileIOManager.End();
+
+			// cleanup files
+            var files = System.IO.Directory.GetFiles(path, "*.json");
+            foreach (var file in files)
+            {
+                System.IO.File.Delete(file);
+            }
+        }
+    }
+
+}

Assets/UXF/Scripts/CSVReader/Tests/Editor.meta renamed to Assets/UXF/Scripts/Tests/Editor.meta

@@ -6,7 +6,8 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace UXF.Tests {
+namespace UXF.Tests
+{
 
 	public class TestSettings {
 

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

@@ -7,7 +7,8 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace UXF.Tests {
+namespace UXF.Tests
+{
 
 	public class TestTrials
 	{
@@ -52,7 +53,7 @@ public void SetUp()
         public void TearDown()
         {
             session.End();
-            fileIOManager.Quit();
+            fileIOManager.End();
             GameObject.DestroyImmediate(gameObject);
         }
 

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

@@ -1,4 +1 @@
 timestamp,log_type,message
-19.82911,Log,Managing action: UXF.Session+<WriteDictToSessionFolder>c__AnonStorey2.<>m__0
-19.9862,Log,Managing action: UXF.Session+<SaveResults>c__AnonStorey3.<>m__0
-19.9862,Log,Managing action: UXF.SessionLogger+<Finalise>c__AnonStorey0.<>m__0

Assets/UXF/Scripts/CSVReader/Tests/Editor/TestSessionBuilding.cs renamed to Assets/UXF/Scripts/Tests/Editor/TestSessionBuilding.cs

@@ -1,6 +1,6 @@
 experiment,ppid,session_num,trial_num,block_num,trial_num_in_block,start_time,end_time,observation
-unit_test,test_trials,1,1,1,1,19.9862,19.9862,1
-unit_test,test_trials,1,2,1,2,19.9862,19.9862,2
-unit_test,test_trials,1,3,2,1,19.9862,19.9862,3
-unit_test,test_trials,1,4,2,2,19.9862,19.9862,4
-unit_test,test_trials,1,5,2,3,19.9862,19.9862,5
+unit_test,test_trials,1,1,1,1,0.9902837,0.9902837,1
+unit_test,test_trials,1,2,1,2,0.9902837,0.9902837,2
+unit_test,test_trials,1,3,2,1,0.9902837,0.9902837,3
+unit_test,test_trials,1,4,2,2,0.9902837,0.9902837,4
+unit_test,test_trials,1,5,2,3,0.9902837,0.9902837,5