Integrating latest 47acbe8

Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp

@@ -0,0 +1,37 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or
+* a third party where indicated.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "precompiled.h"
+#include <AzTest/AzTest.h>
+
+class ScriptEventsEditorTests
+    : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+
+    }
+
+    void TearDown() override
+    {
+
+    }
+};
+
+// Provide a stub test so that AssetProcessorBatch.exe can run Editor Test builds safely.
+TEST_F(ScriptEventsEditorTests, StubTest)
+{
+    ASSERT_TRUE(true);
+}
+
+AZ_UNIT_TEST_HOOK();

Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp

@@ -277,6 +277,7 @@ namespace ScriptEventsTests
         while (!condition())
         {
             AZ::Data::AssetBus::ExecuteQueuedEvents();
+            AZ::SystemTickBus::ExecuteQueuedEvents();
 
             AZ::Data::AssetManager::Instance().DispatchEvents();
             AZStd::this_thread::yield();
@@ -335,7 +336,7 @@ namespace ScriptEventsTests
 
         assetHandler.BusDisconnect();
 
-        ScriptEvents::Internal::ScriptEvent scriptEventV0;
+        ScriptEvents::Internal::ScriptEventRegistration scriptEventV0;
 
         assetData = AZ::Data::AssetManager::Instance().FindOrCreateAsset<ScriptEvents::ScriptEventsAsset>(assetId, AZ::Data::AssetLoadBehavior::Default);
 
@@ -406,7 +407,8 @@ namespace ScriptEventsTests
         }
 
         handler->Disconnect();
-        scriptEventV0.BusDisconnect();
+        AZ::SystemTickBus::Handler* systemTickBus = &scriptEventV0;
+        systemTickBus->BusDisconnect();
 
         EXPECT_TRUE(behaviorEbus->m_destroyHandler->Invoke(handler));