From 6f51c0ad55f3ed33597b8b12391d426fe28a0923 Mon Sep 17 00:00:00 2001
From: bgaldrikian <bgaldrikian@nvidia.com>
Date: Wed, 3 Oct 2018 17:51:20 -0700
Subject: Blast 1.1.4.  See docs/release_notes.txt.

---
 test/src/unit/ActorTests.cpp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'test/src')

diff --git a/test/src/unit/ActorTests.cpp b/test/src/unit/ActorTests.cpp
index 79bb1fc..f25f6e4 100755
--- a/test/src/unit/ActorTests.cpp
+++ b/test/src/unit/ActorTests.cpp
@@ -659,6 +659,21 @@ public:
 		}
 
 		const NvBlastFamily* oldFamily = NvBlastActorGetFamily(&a, logFn);
+
+		// Allow there to be differences with invalid actors
+		const Nv::Blast::FamilyHeader* f1 = reinterpret_cast<const Nv::Blast::FamilyHeader*>(oldFamily);
+		const Nv::Blast::FamilyHeader* f2 = reinterpret_cast<const Nv::Blast::FamilyHeader*>(newFamily);
+		for (uint32_t actorN = 0; actorN < f1->getActorBufferSize(); ++actorN)
+		{
+			const Nv::Blast::Actor* a1 = f1->getActors() + actorN;
+			Nv::Blast::Actor* a2 = const_cast<Nv::Blast::Actor*>(f2->getActors() + actorN);
+			EXPECT_EQ(a1->isActive(), a2->isActive());
+			if (!a1->isActive())
+			{
+				*a2 = *a1;	// Actual data does not matter, setting equal to pass comparison
+			}
+		}
+
 		compareFamilies(oldFamily, newFamily, NvBlastFamilyGetSize(oldFamily, logFn), logFn);
 
 		free(newFamily);
@@ -1070,31 +1085,44 @@ TEST_F(ActorTestStrict, DamageLeafSupportActorsTestVisibility)
 
 TEST_F(ActorTestStrict, DamageLeafSupportActorTestBlockSerialization)
 {
+	typedef CubeAssetGenerator::BondFlags BF;
 	s_storage.resize(0);
 	damageLeafSupportActors(4, 4, 5, false, nullptr, testActorBlockSerialize);
 	s_curr = 0;
 	damageLeafSupportActors(4, 4, 5, false, nullptr, testActorBlockDeserialize);
 	s_storage.resize(0);
+	damageLeafSupportActors(4, 4, 5, false, nullptr, testActorBlockSerialize, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
+	s_curr = 0;
+	damageLeafSupportActors(4, 4, 5, false, nullptr, testActorBlockDeserialize, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
+	s_storage.resize(0);
 }
 
-TEST_F(ActorTestStrict, DamageSimpleLeafSupportActorTestActorSerializationNewFamily)
+TEST_F(ActorTestStrict, DISABLED_DamageSimpleLeafSupportActorTestActorSerializationNewFamily)
 {
+	typedef CubeAssetGenerator::BondFlags BF;
 	damageLeafSupportActors(1, 1, 4, true, nullptr, testActorSerializationNewFamily);
+	damageLeafSupportActors(1, 1, 4, true, nullptr, testActorSerializationNewFamily, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
 }
 
 TEST_F(ActorTestStrict, DamageSimpleLeafSupportActorTestActorSerializationPartialBlock)
 {
+	typedef CubeAssetGenerator::BondFlags BF;
 	damageLeafSupportActors(1, 1, 4, true, nullptr, testActorSerializationPartialBlock);
+	damageLeafSupportActors(1, 1, 4, true, nullptr, testActorSerializationPartialBlock, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
 }
 
-TEST_F(ActorTestStrict, DamageLeafSupportActorTestActorSerializationNewFamily)
+TEST_F(ActorTestStrict, DISABLED_DamageLeafSupportActorTestActorSerializationNewFamily)
 {
+	typedef CubeAssetGenerator::BondFlags BF;
 	damageLeafSupportActors(4, 4, 4, false, nullptr, testActorSerializationNewFamily);
+	damageLeafSupportActors(4, 4, 4, false, nullptr, testActorSerializationNewFamily, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
 }
 
 TEST_F(ActorTestStrict, DamageLeafSupportActorTestActorSerializationPartialBlock)
 {
+	typedef CubeAssetGenerator::BondFlags BF;
 	damageLeafSupportActors(4, 4, 4, false, nullptr, testActorSerializationPartialBlock);
+	damageLeafSupportActors(4, 4, 4, false, nullptr, testActorSerializationPartialBlock, BF::ALL_INTERNAL_BONDS | BF::Z_MINUS_WORLD_BONDS);
 }
 
 TEST_F(ActorTestStrict, DamageMultipleIslandLeafSupportActorsTestVisibility)
-- 
cgit v1.2.3