Integrating github/staging through commit ab87ed9
This commit is contained in:
@@ -196,8 +196,7 @@ namespace UnitTest
|
||||
fileIO->Remove(s_catalogFile);
|
||||
}
|
||||
|
||||
int platformCount = 0;
|
||||
for (auto thisPlatform : m_testPlatforms)
|
||||
for (size_t platformCount = 0; platformCount < s_totalTestPlatforms; ++platformCount)
|
||||
{
|
||||
// Deleting all the temporary files
|
||||
for (int idx = 0; idx < s_totalAssets; idx++)
|
||||
@@ -208,7 +207,6 @@ namespace UnitTest
|
||||
fileIO->Remove(m_assetsPathFull[platformCount][idx].c_str());
|
||||
}
|
||||
}
|
||||
++platformCount;
|
||||
}
|
||||
|
||||
if (fileIO->Exists(TestSliceAssetPath))
|
||||
|
||||
@@ -448,7 +448,7 @@ namespace UnitTest
|
||||
entity->Deactivate();
|
||||
|
||||
// Add placeholder component which implements component mode.
|
||||
const AZ::Component* placeholder1 = entity->CreateComponent<OverrideMouseInteractionComponent>();
|
||||
entity->CreateComponent<OverrideMouseInteractionComponent>();
|
||||
|
||||
entity->Activate();
|
||||
|
||||
|
||||
@@ -200,7 +200,6 @@ namespace UnitTest
|
||||
PrefabTestComponent* prefabTestComponent = aznew PrefabTestComponent(true);
|
||||
entity->Deactivate();
|
||||
entity->AddComponent(prefabTestComponent);
|
||||
auto expectedComponentId = prefabTestComponent->GetId();
|
||||
PrefabDom updatedDom;
|
||||
ASSERT_TRUE(PrefabDomUtils::StoreInstanceInPrefabDom(*newInstance, updatedDom));
|
||||
newTemplateDom.CopyFrom(updatedDom, newTemplateDom.GetAllocator());
|
||||
|
||||
@@ -136,7 +136,6 @@ namespace UnitTest
|
||||
builder.Add("RandomKey", this->GetValue());
|
||||
|
||||
AzFramework::SpawnableMetaData metaData(builder.BuildMetaData());
|
||||
GetType stored{};
|
||||
EXPECT_EQ(this->GetValueType(), metaData.GetType("RandomKey"));
|
||||
}
|
||||
|
||||
|
||||
@@ -570,7 +570,7 @@ namespace UnitTest
|
||||
|
||||
TestComponentD_V1::Reflect(m_serializeContext.get());
|
||||
AZ::Entity* entity = aznew AZ::Entity();
|
||||
TestComponentD_V1* component = entity->CreateComponent<TestComponentD_V1>();
|
||||
entity->CreateComponent<TestComponentD_V1>();
|
||||
// Supply a specific Asset Guid to help with debugging
|
||||
AZ::Data::AssetId sliceAssetId = SaveAsSlice(entity, "{10000000-0000-0000-0000-000000000000}", "datapatch_base.slice");
|
||||
entity = nullptr;
|
||||
|
||||
@@ -149,7 +149,6 @@ namespace UnitTest
|
||||
});
|
||||
|
||||
auto clusterEntry = m_viewportManagerWrapper.GetViewportManager()->GetClusterMap().find(clusterId);
|
||||
auto button = clusterEntry->second->GetButton(buttonId);
|
||||
|
||||
// trigger the cluster
|
||||
m_viewportManagerWrapper.GetViewportManager()->RegisterClusterEventHandler(clusterId, handler);
|
||||
|
||||
Reference in New Issue
Block a user