Fix Tests for Linux/OS X

Author: govertbuijs

.gitignore

@@ -66,4 +66,6 @@ $RECYCLE.BIN/
 .idea/*
 example_output/*
 
-Assets/MyAWSCredentials.asset*
+Assets/MyAWSCredentials.asset*
+
+UserSettings/

Assets/UXF/Tests/Editor/TestFileIOManager.cs

@@ -1,37 +1,31 @@
 using UnityEngine;
-using UnityEditor;
-using UnityEngine.Events;
-using UnityEngine.TestTools;
 using System.Collections.Generic;
 using NUnit.Framework;
-using System.Collections;
 using System.IO;
 
 namespace UXF.Tests
 {
-
     public class TestFileSaver
     {
-
         string experiment = "fileSaver_test";
         string ppid = "test_ppid";
         int sessionNum = 1;
-		FileSaver fileSaver;
+        FileSaver fileSaver;
 
         [SetUp]
         public void SetUp()
         {
-			var gameObject = new GameObject();
-			fileSaver = gameObject.AddComponent<FileSaver>();
-			fileSaver.verboseDebug = true;
+            var gameObject = new GameObject();
+            fileSaver = gameObject.AddComponent<FileSaver>();
+            fileSaver.verboseDebug = true;
         }
 
 
-		[TearDown]
-		public void TearDown()
-		{			
-			GameObject.DestroyImmediate(fileSaver.gameObject);
-		}
+        [TearDown]
+        public void TearDown()
+        {
+            GameObject.DestroyImmediate(fileSaver.gameObject);
+        }
 
 
         [Test]
@@ -41,32 +35,34 @@ public void WriteManyFiles()
             fileSaver.SetUp();
 
             // generate a large dictionary
-			var dict = new Dictionary<string, object>();
+            var dict = new Dictionary<string, object>();
 
             var largeArray = new string[100];
             string largeString = new string('*', 50000);
 
-			// write lots and lots of JSON files
-			int n = 100;
+            // write lots and lots of JSON files
+            int n = 100;
             string[] fpaths = new string[n];
-			for (int i = 0; i < n; i++)
-			{
-				string fileName = string.Format("{0}", i);
-				Debug.LogFormat("Queueing {0}", fileName);
-            	string fpath = fileSaver.HandleText(largeString, experiment, ppid, sessionNum, fileName, UXFDataType.OtherSessionData);
+            for (int i = 0; i < n; i++)
+            {
+                string fileName = string.Format("{0}", i);
+                Debug.LogFormat("Queueing {0}", fileName);
+                string fpath = fileSaver.HandleText(largeString, experiment, ppid, sessionNum, fileName,
+                    UXFDataType.OtherSessionData);
                 fpaths[i] = fpath;
-			}
+            }
 
             Debug.Log("###########################################");
             Debug.Log("############## CLEANING UP ################");
             Debug.Log("###########################################");
             fileSaver.CleanUp();
 
-            Assert.Throws<System.InvalidOperationException>(() => {
+            Assert.Throws<System.InvalidOperationException>(() =>
+            {
                 fileSaver.HandleText(largeString, experiment, ppid, sessionNum, "0", UXFDataType.OtherSessionData);
             });
 
-			// cleanup files
+            // cleanup files
             foreach (var fpath in fpaths)
             {
                 System.IO.File.Delete(Path.Combine(fileSaver.StoragePath, fpath));
@@ -80,12 +76,10 @@ public void EarlyExit()
             fileSaver.StoragePath = "example_output";
             fileSaver.SetUp();
             fileSaver.CleanUp();
-			
-			Assert.Throws<System.InvalidOperationException>(
-				() => {
-                    fileSaver.ManageInWorker(() => Debug.Log("Code enqueued after FileSaver ended"));
-				}
-			);
+
+            Assert.Throws<System.InvalidOperationException>(
+                () => { fileSaver.ManageInWorker(() => Debug.Log("Code enqueued after FileSaver ended")); }
+            );
 
             fileSaver.SetUp();
             fileSaver.ManageInWorker(() => Debug.Log("Code enqueued after FileSaver re-opened"));
@@ -95,10 +89,18 @@ public void EarlyExit()
         [Test]
         public void AbsolutePath()
         {
-            fileSaver.StoragePath = "C:/example_output";
+            if (SystemInfo.operatingSystemFamily == OperatingSystemFamily.Windows)
+            {
+                fileSaver.StoragePath = "C:/example_output";
+            }
+            else
+            {
+                fileSaver.StoragePath = "/tmp/example_output";
+            }
             fileSaver.SetUp();
-            
-            string outString = fileSaver.HandleText("abc", experiment, ppid, sessionNum, "test", UXFDataType.OtherSessionData);
+
+            string outString =
+                fileSaver.HandleText("abc", experiment, ppid, sessionNum, "test", UXFDataType.OtherSessionData);
 
             Assert.AreEqual(outString, @"fileSaver_test/test_ppid/S001/other/test.txt");
 
@@ -115,18 +117,18 @@ public void PersistentDataPath()
             string dataOutput = "abc";
             fileSaver.HandleText(dataOutput, experiment, ppid, sessionNum, "test", UXFDataType.OtherSessionData);
             fileSaver.CleanUp();
-            string outFile = Path.Combine(Application.persistentDataPath, @"fileSaver_test/test_ppid/S001/other/test.txt");
+            string outFile = Path.Combine(Application.persistentDataPath,
+                @"fileSaver_test/test_ppid/S001/other/test.txt");
 
             string readData = File.ReadAllText(outFile);
             Assert.AreEqual(dataOutput, readData);
-            
+
             if (File.Exists(outFile)) File.Delete(outFile);
         }
 
         [Test]
         public void FileSaverRelPath()
         {
-
             Assert.AreEqual(
                 FileSaver.GetRelativePath("C:\\base", "C:\\base\\123"),
                 "123"
@@ -139,15 +141,13 @@ public void FileSaverRelPath()
 
             Assert.AreEqual(
                 FileSaver.GetRelativePath("base/", "base\\123"),
-                "123"
+                SystemInfo.operatingSystemFamily == OperatingSystemFamily.Windows ? "123" : "../123"
             );
 
             Assert.AreEqual(
                 FileSaver.GetRelativePath("C:/base/", "C:/base\\123"),
-                "123"
+                SystemInfo.operatingSystemFamily == OperatingSystemFamily.Windows ? "123" : "../123" 
             );
         }
-
     }
-
-}
+}

Assets/UXF/Tests/Editor/TestJSON.cs

@@ -1,28 +1,23 @@
 using UnityEngine;
-using UnityEditor;
-using UnityEngine.TestTools;
 using NUnit.Framework;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 
 namespace UXF.Tests
 {
-	public class TestJSON
-	{
+    public class TestJSON
+    {
+        Dictionary<string, object> dict = new Dictionary<string, object>()
+        {
+            {"string", "aaa"},
+            {"bool", true},
+            {"int", 3},
+            {"float", 3.14f},
+            {"list", new List<object>() {1, 2, 3, 4}},
+            {"array", new object[] {1, 2, 3, 4}},
+            {"object", new Dictionary<string, object>() {{"a", 1}, {"b", "abc"}}}
+        };
 
-		Dictionary<string, object> dict = new Dictionary<string, object>()
-		{
-			{"string", "aaa"},
-			{"bool", true},
-			{"int", 3},
-			{"float", 3.14f},
-			{"list", new List<object>(){1, 2, 3, 4}},
-			{"array", new object[]{1, 2, 3, 4}},
-			{"object", new Dictionary<string, object>(){{"a", 1}, {"b", "abc"}}}
-		};
-
-		const string jsonString = @"{
+        const string jsonString = @"{
     ""string"": ""aaa"",
     ""bool"": true,
     ""int"": 3,
@@ -46,22 +41,22 @@ public class TestJSON
 }";
 
 
-		[Test]
-		public void JSONIndentation()
-		{
-			string outString = MiniJSON.Json.Serialize(dict);
-			Assert.AreEqual(jsonString, outString);
-		}
+        [Test]
+        public void JSONIndentation()
+        {
+            string outString = MiniJSON.Json.Serialize(dict);
+            Assert.AreEqual(jsonString, outString.Replace("\r", ""));
+        }
 
-		[Test]
-		public void VectorSerialize()
-		{
+        [Test]
+        public void VectorSerialize()
+        {
             var vectorDict = new Dictionary<string, object>
             {
-                { "vector3", new Vector3(1, 2, 3) },
-                { "vector2", new Vector2(1, 2) }
+                {"vector3", new Vector3(1, 2, 3)},
+                {"vector2", new Vector2(1, 2)}
             };
-			
+
             string vectorString = @"{
     ""vector3"": {
         ""x"": 1,
@@ -73,11 +68,9 @@ public void VectorSerialize()
         ""y"": 2
     }
 }";
-            
-            string outString = MiniJSON.Json.Serialize(vectorDict);
-			Assert.AreEqual(vectorString, outString);
-		}
-
-	}
 
+            string outString = MiniJSON.Json.Serialize(vectorDict);
+            Assert.AreEqual(vectorString, outString.Replace("\r", ""));
+        }
+    }
 }