Merge pull request #52 from ztamas83/fix_monitor

Only trigger DeviceChanged event if there is a change in device state

Author: wherewhere

AdvancedSharpAdbClient.Tests/DeviceMonitorTests.cs

@@ -157,7 +157,7 @@ public void StartInitialDeviceListTest()
         }
 
         [Fact]
-        public void DeviceChangedTest()
+        public void DeviceChanged_TriggeredWhenStatusChanged()
         {
             Socket.WaitForNewData = true;
 
@@ -186,6 +186,8 @@ public void DeviceChangedTest()
             Socket.Responses.Clear();
             Socket.Requests.Clear();
 
+            sink.ResetSignals();
+
             // Device disconnects
             ManualResetEvent eventWaiter = sink.CreateEventSignal();
 
@@ -199,13 +201,64 @@ public void DeviceChangedTest()
 
                 Assert.Equal(1, monitor.Devices.Count);
                 Assert.Equal(DeviceState.Online, monitor.Devices.ElementAt(0).State);
-                Assert.Single(sink.ConnectedEvents);
+                Assert.Empty(sink.ConnectedEvents);
                 Assert.Single(sink.ChangedEvents);
                 Assert.Empty(sink.DisconnectedEvents);
                 Assert.Equal("169.254.109.177:5555", sink.ChangedEvents[0].Device.Serial);
             });
         }
 
+        [Fact]
+        public void DeviceChanged_NoTriggerIfStatusIsSame()
+        {
+            Socket.WaitForNewData = true;
+
+            using DeviceMonitor monitor = new(Socket);
+            DeviceMonitorSink sink = new(monitor);
+
+            Assert.Equal(0, monitor.Devices.Count);
+
+            // Start the monitor, detect the initial device.
+            RunTest(
+            OkResponse,
+            ResponseMessages("169.254.109.177:5555\toffline\n"),
+            Requests("host:track-devices"),
+            () =>
+            {
+                monitor.Start();
+
+                Assert.Equal(1, monitor.Devices.Count);
+                Assert.Equal(DeviceState.Offline, monitor.Devices.ElementAt(0).State);
+                Assert.Single(sink.ConnectedEvents);
+                Assert.Empty(sink.ChangedEvents);
+                Assert.Empty(sink.DisconnectedEvents);
+            });
+
+            Socket.ResponseMessages.Clear();
+            Socket.Responses.Clear();
+            Socket.Requests.Clear();
+
+            sink.ResetSignals();
+
+            // Something happens but device does not change
+            ManualResetEvent eventWaiter = sink.CreateEventSignal();
+
+            RunTest(
+            NoResponses,
+            ResponseMessages("169.254.109.177:5555\toffline\n"),
+            Requests(),
+            () =>
+            {
+                eventWaiter.WaitOne(1000);
+
+                Assert.Equal(1, monitor.Devices.Count);
+                Assert.Equal(DeviceState.Offline, monitor.Devices.ElementAt(0).State);
+                Assert.Empty(sink.ConnectedEvents);
+                Assert.Empty(sink.ChangedEvents);
+                Assert.Empty(sink.DisconnectedEvents);
+            });
+        }
+
         /// <summary>
         /// Tests the <see cref="DeviceMonitor"/> in a case where the adb server dies in the middle of the monitor
         /// loop. The <see cref="DeviceMonitor"/> should detect this condition and restart the adb server.

AdvancedSharpAdbClient.Tests/Dummys/DeviceMonitorSink.cs

@@ -18,6 +18,13 @@ public DeviceMonitorSink(DeviceMonitor monitor)
             ConnectedEvents = new Collection<DeviceDataEventArgs>();
         }
 
+        public void ResetSignals()
+        {
+            ChangedEvents.Clear();
+            DisconnectedEvents.Clear();
+            ConnectedEvents.Clear();
+        }
+
         public Collection<DeviceDataEventArgs> DisconnectedEvents { get; private set; }
 
         public Collection<DeviceDataEventArgs> ConnectedEvents { get; private set; }

AdvancedSharpAdbClient/DeviceMonitor.cs

@@ -324,7 +324,7 @@ private void UpdateDevices(List<DeviceData> devices)
                         this.devices.Add(device);
                         OnDeviceConnected(new DeviceDataEventArgs(device));
                     }
-                    else
+                    else if (existingDevice.State != device.State)
                     {
                         existingDevice.State = device.State;
                         OnDeviceChanged(new DeviceDataEventArgs(existingDevice));