Фиксы билд тестера

AdventureTimeSS14 · Aug 21, 2024 · 513c35e · 513c35e
1 parent d597a79
commit 513c35e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -87,7 +87,15 @@ static AlertsUI FindAlertsUI(Control control)
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
-                var expectedIDs = new[] { "HumanHealth", "Debug1", "Debug2" };
+                var expectedIDs = new[] { "Debug1", "Debug2" }; // ADT Fix IPC from failing tests
+
+                // ADT Fix IPC from failing tests start
+                var categories = alertControls.Select(ac => ac.Alert.Category);
+                var expectedCategories = new[] { "Health" };
+
+                Assert.That(categories, Is.SupersetOf(expectedCategories));
+                // ADT Fix IPC from failing tests end
+
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 
@@ -104,7 +112,15 @@ await client.WaitAssertion(() =>
                 Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
                 var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
                 var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray();
-                var expectedIDs = new[] { "HumanHealth", "Debug2" };
+                var expectedIDs = new[] { "Debug2" }; // ADT Fix IPC from failing tests
+
+                // ADT Fix IPC from failing tests start
+                var categories = alertControls.Select(ac => ac.Alert.Category);
+                var expectedCategories = new[] { "Health" };
+
+                Assert.That(categories, Is.SupersetOf(expectedCategories));
+                // ADT Fix IPC from failing tests end
+
                 Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
             });
 

diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
@@ -222,14 +222,20 @@ void CheckDummy(int i)
         var totalSeconds = 30;
         var totalTicks = (int) Math.Ceiling(totalSeconds / server.Timing.TickPeriod.TotalSeconds);
         var increment = 5;
-        var resp = entMan.GetComponent<RespiratorComponent>(player);
-        var damage = entMan.GetComponent<DamageableComponent>(player);
-        for (var tick = 0; tick < totalTicks; tick += increment)
+
+        // ADT Fix IPC from failing tests start
+        if (entMan.TryGetComponent<RespiratorComponent>(player, out var resp))
         {
-            await pair.RunTicksSync(increment);
-            Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
-            Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
+            // var resp = entMan.GetComponent<RespiratorComponent>(player);
+            var damage = entMan.GetComponent<DamageableComponent>(player);
+            for (var tick = 0; tick < totalTicks; tick += increment)
+            {
+                await pair.RunTicksSync(increment);
+                Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold));
+                Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
+            }
         }
+        // ADT Fix IPC from failing tests end
 
         // Check that the round does not end prematurely when agents are deleted in the outpost
         var nukies = dummyEnts.Where(entMan.HasComponent<NukeOperativeComponent>).Append(player).ToArray();