Fix Entities in RxMock

src/Fakes/NetDaemon.Fakes/RxAppMock.cs

@@ -4,6 +4,9 @@
 using NetDaemon.Common.Fluent;
 using NetDaemon.Common.Reactive;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
 
 namespace NetDaemon.Daemon.Fakes
 {
@@ -13,10 +16,15 @@ namespace NetDaemon.Daemon.Fakes
     /// </summary>
     public class RxAppMock : Mock<INetDaemonRxApp>
     {
+        /// <summary>
+        ///     Current entities and states
+        /// </summary>
+        public IList<EntityState> MockState { get; } = new List<EntityState>();
+
         /// <summary>
         ///     Observable fake states
         /// </summary>
-        public ObservableBase<(EntityState, EntityState)> StateChangesObservable { get; }
+        public ObservableBase<(EntityState Old, EntityState New)> StateChangesObservable { get; }
 
         /// <summary>
         ///     Observalbe fake events
@@ -35,13 +43,30 @@ public RxAppMock()
             ReactiveEventMock r = new(this);//new EventObservable(loggerMock.Object, Object);
 
             Setup(n => n.EventChanges).Returns(r);
-            Setup(n => n.Entity(It.IsAny<string>())).Returns<string>(_ =>
+            Setup(n => n.Entity(It.IsAny<string>())).Returns<string>(entityId =>
+            {
+                var m = new Mock<IRxEntityBase>();
+                m.Setup(n => n.StateChanges).Returns(StateChangesObservable.Where(f => f.New?.EntityId == entityId && f.New?.State != f.Old?.State));
+                m.Setup(n => n.StateAllChanges).Returns(StateChangesObservable.Where(f => f.New?.EntityId == entityId));
+                return m.Object;
+            });
+
+            Setup(n => n.Entities(It.IsAny<string[]>())).Returns<string[]>(entityIds =>
             {
                 var m = new Mock<IRxEntityBase>();
-                m.Setup(n => n.StateChanges).Returns(StateChangesObservable);
-                m.Setup(n => n.StateAllChanges).Returns(StateChangesObservable);
+                m.Setup(n => n.StateChanges).Returns(StateChangesObservable.Where(f => entityIds.Contains(f.New.EntityId) && f.New?.State != f.Old?.State));
+                m.Setup(n => n.StateAllChanges).Returns(StateChangesObservable.Where(f => entityIds.Contains(f.New.EntityId)));
                 return m.Object;
             });
+
+            Setup(n => n.Entities(It.IsAny<Func<IEntityProperties, bool>>())).Returns<Func<IEntityProperties, bool>>(func =>
+            {
+                var x = MockState.Where(func);
+                var y = x.Select(n => n.EntityId).ToArray();
+                var m = new Mock<IRxEntityBase>();
+                m.Setup(n => n.StateChanges).Returns(StateChangesObservable.Where(f => y.Contains(f.New.EntityId) && f.New?.State != f.Old?.State));
+                m.Setup(n => n.StateAllChanges).Returns(StateChangesObservable.Where(f => y.Contains(f.New.EntityId))); return m.Object;
+            });
         }
 
         /// <summary>

tests/NetDaemon.Daemon.Tests/FakesTests/FakeMockableApp.cs

@@ -51,6 +51,8 @@ public void Initialize()
             .Where(e => e.New?.State == "on" && e.Old?.State == "off")
             .Subscribe(_ => _app.Entity("sensor.mysensor").SetState(20, new { battery_level = 90 }));
 
+            _app.Entities(n => n.EntityId!.EndsWith("entities", StringComparison.InvariantCultureIgnoreCase)).StateChanges.Subscribe(_ => _app.Entity("light.kitchen").TurnOn());
+
             _app.Entity("sensor.temperature")
                 .StateAllChanges
                 .Where(e => e.New?.Attribute?.battery_level < 15)

tests/NetDaemon.Daemon.Tests/FakesTests/RxMockTests.cs

@@ -75,6 +75,40 @@ public void TestFakeMockableBinarySensorApp()
             VerifyEntityToggle("light.kitchen", new { brightness = 100 });
         }
 
+        [Fact]
+        public void TestFakeMockableBinarySensorAppEntities()
+        {
+            // ARRANGE
+            FakeMockableAppImplementation app = new(Object);
+            // Have to add the entity before initialize to support lambda selections
+            MockState.Add(new() { EntityId = "binary_sensor.test_entities" });
+
+            app.Initialize();
+
+            // ACT
+            TriggerStateChange("binary_sensor.test_entities", "off", "on");
+
+            // ASSERT
+            VerifyEntityTurnOn("light.kitchen");
+        }
+
+        [Fact]
+        public void TestFakeMockableBinarySensorAppEntitiesFalse()
+        {
+            // ARRANGE
+            FakeMockableAppImplementation app = new(Object);
+            // Not end with entities
+            MockState.Add(new() { EntityId = "binary_sensor.test_entity" });
+
+            app.Initialize();
+
+            // ACT
+            TriggerStateChange("binary_sensor.test_entities", "off", "on");
+
+            // ASSERT
+            VerifyEntityTurnOn("light.kitchen", times: Times.Never());
+        }
+
         [Fact]
         public void TestFakeEventTurnsOnLight()
         {