Merge pull request #403 from Unity-Technologies/UNI-47629-fix-integration-unit-tests

Uni 47629 fix integration unit tests

Author: inwoods

Assets/com.unity.formats.fbx.tests/FbxExportSettingsTest.cs

@@ -482,7 +482,7 @@ private void TestLocations(Dictionary<string,List<string>> data)
             ExportSettings.instance.ClearDCCOptions();
 
             GUIContent[] options = ExportSettings.GetDCCOptions();
-            Assert.AreEqual(options.Length, expectedResult);
+            Assert.AreEqual(expectedResult, options.Length);
 
             if (data.ContainsKey("expected3DApp"))
             {

Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs

@@ -283,12 +283,13 @@ private static string GetMayaLocationFromEnvironmentVariable(string env)
         /// </summary>
         private static HashSet<string> GetCustomVendorLocations()
         {
-            HashSet<string> result = new HashSet<string>();
+            HashSet<string> result = null;
 
             var environmentVariable = Environment.GetEnvironmentVariable("UNITY_3DAPP_VENDOR_LOCATIONS");
 
             if (!string.IsNullOrEmpty(environmentVariable))
             {
+                result = new HashSet<string>();
                 string[] locations = environmentVariable.Split(';');
                 foreach (var location in locations)
                 {
@@ -298,8 +299,6 @@ private static HashSet<string> GetCustomVendorLocations()
                     }
                 }
             }
-            
-
             return result;
         }
 
@@ -347,7 +346,7 @@ public static string[] DCCVendorLocations
             {
                 HashSet<string> result = GetCustomVendorLocations();
 
-                if (result == null || result.Count < 1)
+                if (result == null)
                 {
                     result = GetDefaultVendorLocations();
                 }

Packages/com.unity.formats.fbx/Editor/Scripts/InstallIntegration.cs

@@ -96,7 +96,6 @@ public class MayaIntegration : DCCIntegration
         private string MODULE_FILENAME { get { return "UnityFbxForMaya"; } }
 
         private const string PACKAGE_NAME = "com.unity.formats.fbx";
-        private const string VERSION_FILENAME = "README.txt";
         private const string VERSION_FIELD = "VERSION";
         private const string VERSION_TAG = "{Version}";
         private const string PROJECT_TAG = "{UnityProject}";
@@ -155,7 +154,6 @@ protected string MAYA_CONFIG_COMMAND { get {
         private string MAYA_CLOSE_COMMAND { get {
                 return string.Format("scriptJob -idleEvent quit;");
         }}
-        private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
         protected static string GetUserFolder()
         {
@@ -221,38 +219,7 @@ private static string GetUserStartupScriptPath(){
 
         public static string GetPackageVersion()
         {
-            string result = null;
-
-            try {
-                string FileName = System.IO.Path.Combine(GetPackagePath(), VERSION_FILENAME);
-
-                System.IO.StreamReader sr = new System.IO.StreamReader(FileName);
-
-                // Read the first line of text
-                string line = sr.ReadLine();
-
-                // Continue to read until you reach end of file
-                while (line != null)
-                {
-                    if (line.StartsWith(VERSION_FIELD, StringComparison.CurrentCulture))
-                    {
-                        string[] fields = line.Split(FIELD_SEPARATORS);
-
-                        if (fields.Length>1)
-                        {
-                            result = fields[1];
-                        }
-                        break;
-                    }
-                    line = sr.ReadLine();
-                }
-            }
-            catch(Exception e)
-            {
-                Debug.LogError(string.Format("Exception failed to read file containing package version ({0})", e.Message));
-            }
-
-            return result;
+            return ModelExporter.GetVersionFromReadme();
         }
 
         private static List<string> ParseTemplateFile(string FileName, Dictionary<string,string> Tokens )