merge(r2): r2-plan03

tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/AlarmActorTests.cs

@@ -1054,4 +1054,31 @@ public class AlarmActorTests : TestKit, IDisposable
         var change = instanceProbe.ExpectMsg<AlarmStateChanged>(TimeSpan.FromSeconds(10));
         Assert.Equal(AlarmState.Active, change.State);
     }
+
+    [Fact]
+    public void ExpressionEvalTaskFault_DoesNotKillTheAlarmTrigger()
+    {
+        var expr = CompileRawTriggerExpression("true");
+        var alarmConfig = new ResolvedAlarm
+        {
+            CanonicalName = "ExprFaultAlarm",
+            TriggerType = "Expression",
+            TriggerConfiguration = "{\"expression\":\"true\"}",
+            PriorityLevel = 1
+        };
+        var instanceProbe = CreateTestProbe();
+        var alarm = ActorOf(Props.Create(() => new AlarmActor(
+            "ExprFaultAlarm", "Pump1", instanceProbe.Ref, alarmConfig,
+            null, _sharedLibrary, _options,
+            NullLogger<AlarmActor>.Instance, expr)));
+
+        // Simulate the faulted scheduler task: must be handled (logged, in-flight
+        // cleared, false applied) — NOT an unhandled Status.Failure.
+        alarm.Tell(new AlarmActor.ExpressionEvalFailed(new ObjectDisposedException("scheduler")));
+
+        // The trigger must still be alive: the next change evaluates and activates.
+        alarm.Tell(new AttributeValueChanged("Pump1", "A", "A", 1, "Good", DateTimeOffset.UtcNow));
+        var change = instanceProbe.ExpectMsg<AlarmStateChanged>(TimeSpan.FromSeconds(10));
+        Assert.Equal(AlarmState.Active, change.State);
+    }
 }

tests/ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests/Actors/ScriptActorTests.cs

@@ -343,13 +343,41 @@ public class ScriptActorTests : TestKit, IDisposable
     private static Script<object?> CompileRawTriggerExpression(string expression)
     {
         var opts = ScriptOptions.Default
-            .WithReferences(typeof(object).Assembly, typeof(Enumerable).Assembly)
+            // The test assembly is referenced so a raw-compiled expression may reference
+            // test-only hooks like EvalGate (used by the faulted-task N2 test).
+            .WithReferences(typeof(object).Assembly, typeof(Enumerable).Assembly, typeof(ScriptActorTests).Assembly)
             .WithImports("System", "System.Collections.Generic", "System.Linq", "System.Threading.Tasks");
         var s = CSharpScript.Create<object?>(expression, opts, typeof(TriggerExpressionGlobals));
         s.Compile();
         return s;
     }
 
+    [Fact]
+    public void ExpressionEvalTaskFault_ClearsInFlight_AndDrainsPendingEvaluation()
+    {
+        var expr = CompileRawTriggerExpression(
+            "ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests.Actors.EvalGate.Block()");
+        var (actor, _) = CreateTriggeredActor(
+            "ExprFault", "Expression", "{\"expression\":\"true\",\"mode\":\"OnTrue\"}", null, expr);
+        try
+        {
+            actor.Tell(Change("A", "1"));                              // eval starts on the scheduler and BLOCKS → _evalInFlight = true
+            AwaitAssert(() => Assert.Equal(1, EvalGate.Entries), TimeSpan.FromSeconds(10));
+            actor.Tell(Change("A", "2"));                              // coalesces → _evalPending = true
+
+            // Simulate the faulted scheduler task the PipeTo failure mapping now surfaces
+            // (e.g. ObjectDisposedException from a disposed ScriptExecutionScheduler).
+            actor.Tell(new ScriptActor.ExpressionEvalFailed(new ObjectDisposedException("scheduler")));
+
+            // In-flight cleared + pending drained ⇒ a SECOND evaluation starts and blocks too.
+            AwaitAssert(() => Assert.Equal(2, EvalGate.Entries), TimeSpan.FromSeconds(10));
+        }
+        finally
+        {
+            EvalGate.Gate.Release(EvalGate.Entries); // ALWAYS free the shared scheduler threads
+        }
+    }
+
     [Fact]
     public void ExpressionTrigger_EvaluatesOnScriptSchedulerThread_AndStillFires()
     {
@@ -504,3 +532,17 @@ public class ScriptActorTests : TestKit, IDisposable
         instance.ExpectMsg<SetStaticAttributeCommand>(TimeSpan.FromSeconds(2));
     }
 }
+
+/// <summary>
+/// Test-only hook referenced by a raw-compiled trigger expression: <see cref="Block"/>
+/// blocks the calling script-scheduler thread on <see cref="Gate"/> so a test can hold an
+/// evaluation "in flight" and count how many evaluations have entered. Used by
+/// <c>ExpressionEvalTaskFault_ClearsInFlight_AndDrainsPendingEvaluation</c>.
+/// </summary>
+public static class EvalGate
+{
+    public static readonly SemaphoreSlim Gate = new(0);
+    private static int _entries;
+    public static int Entries => Volatile.Read(ref _entries);
+    public static bool Block() { Interlocked.Increment(ref _entries); Gate.Wait(); return false; }
+}