Update the MRTK to support being placed in arbitrary folder names up to three directories deep.

Assets/MixedRealityToolkit.Tests/EditModeTests/Core/MixedRealityToolkitFilesTests.cs

@@ -6,124 +6,44 @@
 using UnityEngine;
 using System;
 using System.IO;
+using System.Linq;
 
 namespace Microsoft.MixedReality.Toolkit.Tests.Core
 {
     // Tests for the MixedRealityToolkitFiles utility class
     public class MixedRealityToolkitFilesTests
     {
-        string[] basePaths = new string[] { "", "C:\\", "C:\\xyz\\", "C:/xyz/" };
-
         [Test]
-        public void FindMatchingModule()
+        public void TestGetDirectories()
         {
-            TestInvalidPath("");
-
-            // Test invalid base name
-            TestInvalidPath("aaa");
-            TestInvalidPath(".SDK");
-            TestInvalidPath("aaa.SDK");
-
-            // Test missing chars
-            TestInvalidPath("MixedRealityToolki.SDK");
-            TestInvalidPath("MixedRealityToolkit.SD");
-            TestInvalidPath("ixedRealityToolkit.SDK");
-            TestInvalidPath("MixedRealityToolkit.DK");
-
-            // Test missing dots
-            TestInvalidPath("SDK");
-            TestInvalidPath("MixedRealityToolkitSDK");
-
-            // Test valid paths
-            TestValidPath("MixedRealityToolkit", MixedRealityToolkitModuleType.Core);
-            TestValidPath("MixedRealityToolkit.SDK", MixedRealityToolkitModuleType.SDK);
-
-            // Test that all modules can be found and internal module map is complete.
-            // Check that MixedRealityToolkitFiles.moduleNameMap has all entries if this fails!
-            var modules = Enum.GetValues(typeof(MixedRealityToolkitModuleType));
-            var moduleNames = Enum.GetNames(typeof(MixedRealityToolkitModuleType));
-            for (int i = 0; i < modules.Length; ++i)
+            MixedRealityToolkitModuleType[] moduleTypes = new MixedRealityToolkitModuleType[]
             {
-                var module = (MixedRealityToolkitModuleType)modules.GetValue(i);
-                if (module != MixedRealityToolkitModuleType.Core)
-                {
-                    TestValidPath($"MixedRealityToolkit.{moduleNames[i]}", module);
-                }
-            }
-        }
-
-        [Test]
-        public void FindMatchingModuleNuget()
-        {
-            // Test invalid base name
-            TestInvalidPath("aaa.1.23-45/MRTK");
-            TestInvalidPath(".1.23-45.SDK/MRTK");
-            TestInvalidPath("aaa.1.23-45.SDK/MRTK");
-
-            // Test missing chars
-            TestInvalidPath("Microsoft.MixedReality.Toolki.SDK.1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SD.1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SDK.1.23-45/MRT");
-
-            TestInvalidPath("icrosoft.MixedReality.Toolkit.SDK.1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.DK.1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SDK.1.23-45/RTK");
-
-            // Test missing dots
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SDK1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.ToolkitSDK.1.23-45/MRTK");
-            TestInvalidPath("Microsoft.MixedReality.ToolkitSDK1.23-45/MRTK");
-
-            // Test missing version
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SDK/MRTK");
-            // Test missing MRTK suffix
-            TestInvalidPath("Microsoft.MixedReality.Toolkit.SDK.1.23-45");
-
-            // Test valid paths
-            TestValidPath("Microsoft.MixedReality.Toolkit.1.23-45/MRTK", MixedRealityToolkitModuleType.Core);
-            TestValidPath("Microsoft.MixedReality.Toolkit.SDK.1.23-45/MRTK", MixedRealityToolkitModuleType.SDK);
-
-            // Test that all modules can be found and internal module map is complete.
-            // Check that MixedRealityToolkitFiles.moduleNameMap has all entries if this fails!
-            var modules = Enum.GetValues(typeof(MixedRealityToolkitModuleType));
-            var moduleNames = Enum.GetNames(typeof(MixedRealityToolkitModuleType));
-            for (int i = 0; i < modules.Length; ++i)
+                MixedRealityToolkitModuleType.Core,
+                MixedRealityToolkitModuleType.Providers,
+                MixedRealityToolkitModuleType.Services,
+                MixedRealityToolkitModuleType.SDK,
+                MixedRealityToolkitModuleType.Examples,
+                MixedRealityToolkitModuleType.Tests,
+                MixedRealityToolkitModuleType.Extensions,
+                MixedRealityToolkitModuleType.Tools,
+            };
+
+            MixedRealityToolkitFiles.RefreshFolders();
+            foreach (var moduleType in moduleTypes)
             {
-                var module = (MixedRealityToolkitModuleType)modules.GetValue(i);
-                if (module != MixedRealityToolkitModuleType.Core)
-                {
-                    TestValidPath($"Microsoft.MixedReality.Toolkit.{moduleNames[i]}.1.23-45/MRTK", (MixedRealityToolkitModuleType)modules.GetValue(i));
-                }
+                // Validate that each module has a corresponding found folder
+                Assert.IsTrue(MixedRealityToolkitFiles.GetDirectories(moduleType).Any());
             }
         }
 
         /// <summary>
         /// Validates that MixedRealityToolkitFiles is able to reason over MRTK folders when placed in the root Asset directory.
         /// </summary>
+        [Test]
         public void TestRootAssetFolderResolution()
         {
-            string resolvedPath = MixedRealityToolkitFiles.MapRelativeFilePathToAbsolutePath("Inspectors/Data/EditorWindowOptions.json");
-            string expectedPath = Path.Combine(Application.dataPath, "MixedRealityToolkit/Inspectors/Data/EditorWindowOptions.json");
-            Assert.AreEqual(expectedPath, resolvedPath);
-        }
-
-        public void TestInvalidPath(string path)
-        {
-            foreach (string basePath in basePaths)
-            {
-                string fullPath = Path.Combine(basePath, path);
-                Assert.False(MixedRealityToolkitFiles.FindMatchingModule(fullPath, out MixedRealityToolkitModuleType module));
-            }
-        }
-
-        public void TestValidPath(string path, MixedRealityToolkitModuleType expectedModule)
-        {
-            foreach (string basePath in basePaths)
-            {
-                string fullPath = Path.Combine(basePath, path);
-                Assert.True(MixedRealityToolkitFiles.FindMatchingModule(fullPath, out MixedRealityToolkitModuleType module));
-                Assert.AreEqual(module, expectedModule);
-            }
+            string resolvedPath = MixedRealityToolkitFiles.MapRelativeFilePathToAbsolutePath("Inspectors\\Data\\EditorWindowOptions.json");
+            Assert.IsNotNull(resolvedPath);
         }
 
         [TearDown]