Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -12,8 +12,8 @@

 #include <AzTest/AzTest.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
-#include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzToolsFramework/Entity/EditorEntityContextComponent.h>
+#include <AzToolsFramework/UnitTest/ToolsTestApplication.h>

 namespace AzToolsFramework
 {
@@ -33,7 +33,8 @@ namespace AzToolsFramework
        {
            m_app.Stop();
        }
-        AzToolsFramework::ToolsApplication m_app;
+        UnitTest::ToolsTestApplication m_app{ "EditorEntityContextComponent" }; // Shorted because Settings Registry specializations
+                                                                                // are 32 characters max.
        AZ::ComponentApplication::Descriptor m_descriptor;
    };