[FIXED] the unit test to be more comprehensive

[FIXED] the way ties are decided to be more quick
[ADDED] a helper function to get the first part of a string, for comparison purposes

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -98,7 +98,7 @@ public override void OnInspectorGUI() {
             var options = ExportSettings.GetDCCOptions();
             // make sure we never initially have browse selected
             if (exportSettings.selectedDCCApp == options.Length - 1) {
-                exportSettings.selectedDCCApp = exportSettings.FindPreferredProgram();
+                exportSettings.selectedDCCApp = exportSettings.GetPreferredDCCApp();
             }
 
             int oldValue = exportSettings.selectedDCCApp;
@@ -226,7 +226,9 @@ private static string TryFindDCC(string dccPath, string ext, ExportSettings.DCCT
     public class ExportSettings : ScriptableSingleton<ExportSettings>
     {
         public const string kDefaultSavePath = ".";
-        private static List<string> preferenceList = new List<string>() {"maya", "mayalt", "3ds", "blender" };
+        private static List<string> s_PreferenceList = new List<string>() {"maya", "mayalt", "3ds", "blender" };
+        public static string s_MaxName = "3ds Max ";
+        public static string s_MayaName = "Maya ";
 
         /// <summary>
         /// The path where all the different versions of Maya are installed
@@ -285,7 +287,7 @@ protected override void LoadDefaults()
         /// </summary>
         /// <returns>The unique name.</returns>
         /// <param name="name">Name.</param>
-        private static string GetUniqueName(string name){
+        public static string GetUniqueName(string name){
             if (!instance.dccOptionNames.Contains(name)) {
                 return name;
             }
@@ -307,7 +309,7 @@ private static string GetUniqueName(string name){
             do {
                 uniqueName = string.Format (format, index, name);
                 index++;
-            } while (instance.dccOptionNames.Contains(name));
+            } while (instance.dccOptionNames.Contains(uniqueName));
 
             return uniqueName;
         }
@@ -317,16 +319,20 @@ private static string GetUniqueName(string name){
         /// Find the latest program available and make that the default choice.
         /// Will always take any Maya version over any 3ds Max version.
         ///
-        /// Returns the index of the most recent program in the list of dccOptionPaths
+        /// Returns the index of the most recent program in the list of dccOptionNames
         ///
         /// </summary>
-        public int FindPreferredProgram()
+        public int GetPreferredDCCApp()
         {
+            if (dccOptionNames == null)
+            {
+                return -1;
+            }
 
-            int newestDCCVersionIndex = 0;
-            int newestDCCVersionNumber = 0;
+            int newestDCCVersionIndex = -1;
+            int newestDCCVersionNumber = -1;
 
-            for (int i = 0; i < dccOptionPaths.Count; i++)
+            for (int i = 0; i < dccOptionNames.Count; i++)
             {
                 int versionToCheck = FindDCCVersion(dccOptionNames[i]);
                 if (versionToCheck > newestDCCVersionNumber)
@@ -336,42 +342,36 @@ public int FindPreferredProgram()
                 }
                 else if (versionToCheck == newestDCCVersionNumber)
                 {
-                    string selection = PickPrefferedName(dccOptionNames[newestDCCVersionIndex], dccOptionNames[i]);
-                    if (selection == dccOptionNames[i])
+                    int selection = ChoosePreferredDCCApp(newestDCCVersionIndex, i);
+                    if (selection == i)
                     {
                         newestDCCVersionIndex = i;
                         newestDCCVersionNumber = FindDCCVersion(dccOptionNames[i]);
                     }
                 }
             }
-            Debug.Assert(newestDCCVersionIndex > -1 && newestDCCVersionIndex < dccOptionPaths.Count);
+            Debug.Assert(newestDCCVersionIndex >= -1 && newestDCCVersionIndex < dccOptionNames.Count);
             return newestDCCVersionIndex;
         }
         /// <summary>
-        /// Gives our preffered program name from two options. ACCEPTS ENTRIES FROM DCCOptionNames LIST
+        /// Takes the index of two program names from dccOptionNames and chooses our preferred one based on the preference list
+        /// This happens in case of a tie between two programs with the same release year / version
         /// </summary>
         /// <param name="optionA"></param>
         /// <param name="optionB"></param>
         /// <returns></returns>
-        private string PickPrefferedName(string optionA, string optionB)
+        private int ChoosePreferredDCCApp(int optionA, int optionB)
         {
-            string[] optionArray = new string[2];
-            optionArray[0] = optionA.ToLower().Split(' ')[0];
-            optionArray[1] = optionB.ToLower().Split(' ')[0];
-            int[] optionScores = new int[2];
+            int scoreA = s_PreferenceList.IndexOf(GetAppNameFromFolderName(dccOptionNames[optionA]));
+            int scoreB = s_PreferenceList.IndexOf(GetAppNameFromFolderName(dccOptionNames[optionB]));
 
-            for (int i = 0; i < 2; i++)
-            {
-                for (int j = 0; j < preferenceList.Count; j++)
-                {
-                    if (optionArray[i] == preferenceList[j])
-                    {
-                        optionScores[i] = j;
-                    }
-                }
-            }
+            return scoreA < scoreB ? optionA : optionB;
+        }
 
-            return optionScores[0] < optionScores[1] ? optionA : optionB;
+        ///
+        private string GetAppNameFromFolderName(string originalString)
+        {
+            return originalString.ToLower().Split(' ')[0];
         }
 
         /// <summary>
@@ -381,8 +381,17 @@ private string PickPrefferedName(string optionA, string optionB)
         /// <returns> the year/version  OR -1 if the year could not be parsed </returns>
         private static int FindDCCVersion(string AppName)
         {
+            if (AppName == null)
+            {
+                return -1;
+            }
+
             int version;
             string[] piecesArray = AppName.Split(' ');
+            if (piecesArray.Length == 0)
+            {
+                return -1;
+            }
             //Get the number, which is always the last chunk separated by a space.
             string number = piecesArray[piecesArray.Length - 1];
 
@@ -439,7 +448,7 @@ private static void FindDCCInstalls() {
                     }
                     string version = product.Substring ("maya".Length);
                     dccOptionPath.Add (GetMayaExePath (productDir.FullName.Replace ("\\", "/")));
-                    dccOptionName.Add (GetUniqueName ("Maya " + version));
+                    dccOptionName.Add (GetUniqueName (s_MayaName + version));
                 }
 
                 if (product.StartsWith ("3ds max", StringComparison.InvariantCultureIgnoreCase)) {
@@ -449,10 +458,10 @@ private static void FindDCCInstalls() {
                     }
                     string version = product.Substring ("3ds max ".Length);
                     dccOptionPath.Add (exePath);
-                    dccOptionName.Add (GetUniqueName ("3ds Max " + version));
+                    dccOptionName.Add (GetUniqueName (s_MaxName + version));
                 }
             }
-            instance.selectedDCCApp = instance.FindPreferredProgram();
+            instance.selectedDCCApp = instance.GetPreferredDCCApp();
         }
 
         /// <summary>
@@ -499,7 +508,7 @@ public static GUIContent[] GetDCCOptions(){
                 var dccPath = instance.dccOptionPaths [i];
                 if (!File.Exists (dccPath)) {
                     if (i == instance.selectedDCCApp) {
-                        instance.selectedDCCApp = instance.FindPreferredProgram();
+                        instance.selectedDCCApp = instance.GetPreferredDCCApp();
                     }
                     namesToDelete.Add (instance.dccOptionNames [i]);
                     pathsToDelete.Add (dccPath);

Assets/FbxExporters/Editor/UnitTests/FbxExportSettingsTest.cs

@@ -181,21 +181,40 @@ public void TestGetSetFields()
 
         [Test]
         public void TestFindPreferredProgram()
-        {           
-            //Putting Maya 2017 and Max 2017 will also test our PickPreferredName function
-            ExportSettings.instance.dccOptionNames = new List<string> { "3ds Max 2000", "Maya 2016", "Maya 2017", "3ds max 2017" };
-            ExportSettings.instance.dccOptionPaths = new List<string> { "3ds Max 2000 path", "maya 2016 path", "maya 2017 path", "3ds max 2017 path"};
-
-            int preferred = ExportSettings.instance.FindPreferredProgram();
+        {
+            //Add a number of fake programs to the list, including some garbage ones
+            ExportSettings.instance.dccOptionNames = new List<string>();
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MaxName + "2000"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2016"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2017"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MaxName + "2017"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName("Blender " + "2.67"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(""));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(null));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "lt"));
+            ExportSettings.instance.dccOptionNames.Add(ExportSettings.GetUniqueName(ExportSettings.s_MayaName + "2017"));
+
+            int preferred = ExportSettings.instance.GetPreferredDCCApp();
             //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 should win because we prefer Maya.
             Assert.AreEqual(preferred, 2);
 
             ExportSettings.instance.dccOptionNames = new List<string> { "Blender 2.67", "Blender 3.0" };
-            ExportSettings.instance.dccOptionPaths = new List<string> { "Blender 2.67 path", "Blender 3.0 path" };
 
-            preferred = ExportSettings.instance.FindPreferredProgram();
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
             //The function should be able to deal with floats well enough to give us a preferred version of soemthing like blender, which does not use the year.
             Assert.AreEqual(preferred, 1);
+
+            ExportSettings.instance.dccOptionNames.Clear();
+            //Try running it with an empty list
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, -1);
+
+            ExportSettings.instance.dccOptionNames = null;
+            //Try running it with a null list
+            preferred = ExportSettings.instance.GetPreferredDCCApp();
+
+            Assert.AreEqual(preferred, -1);
         }
 
     }