test: Fix Lovense tests for dealing with notify-only identification

Lovense tests relied on reads for device identification, which was removed because devices only use notify/indicate. Update tests to reflect this.

Author: qdot

Buttplug.Test/Devices/Protocols/LovenseTests.cs

@@ -32,7 +32,7 @@ public async Task Init()
 
 // Just leave name the same as the prefix, we'll set device type via initialize.
 awaittestUtil.SetupTest<LovenseProtocol>("LVS",false);
-testUtil.AddExpectedRead(Endpoints.Tx,Encoding.ASCII.GetBytes("W:39:000000000000"));
+testUtil.AddExpectedNotify("DeviceType;",Encoding.ASCII.GetBytes("W:39:000000000000"));
 awaittestUtil.Initialize();
 }
 
@@ -119,7 +119,7 @@ public async Task Init()
 
 // Just leave name the same as the prefix, we'll set device type via initialize.
 awaittestUtil.SetupTest<LovenseProtocol>("LVS",false);
-testUtil.AddExpectedRead(Endpoints.Tx,Encoding.ASCII.GetBytes("P:39:000000000000"));
+testUtil.AddExpectedNotify("DeviceType;",Encoding.ASCII.GetBytes("P:39:000000000000"));
 awaittestUtil.Initialize();
 }
 
@@ -210,7 +210,7 @@ public async Task Init()
 
 // Just leave name the same as the prefix, we'll set device type via initialize.
 awaittestUtil.SetupTest<LovenseProtocol>("LVS",false);
-testUtil.AddExpectedRead(Endpoints.Tx,Encoding.ASCII.GetBytes("A:13:000000000000"));
+testUtil.AddExpectedNotify("DeviceType;",Encoding.ASCII.GetBytes("A:13:000000000000"));
 awaittestUtil.Initialize();
 }
 

Buttplug.Test/Devices/Protocols/Utils/ProtocolTestUtils.cs

@@ -62,6 +62,11 @@ public void AddExpectedRead(string aCharacteristic, byte[] aValue)
 _testImpl.AddExpectedRead(aCharacteristic,aValue);
 }
 
+publicvoidAddExpectedNotify(stringaTriggerString,byte[]aValue)
+{
+_testImpl.AddExpectedNotify(aTriggerString,aValue);
+}
+
 privatevoidClear()
 {
 _testImpl.LastWritten.Clear();

Buttplug/Test/TestDeviceImpl.cs

@@ -2,6 +2,7 @@
 usingSystem.Collections.Generic;
 usingSystem.Diagnostics.CodeAnalysis;
 usingSystem.Linq;
+usingSystem.Text;
 usingSystem.Threading;
 usingSystem.Threading.Tasks;
 usingButtplug.Core.Logging;
@@ -27,6 +28,8 @@ public class ReadData
 
 publicList<WriteData>LastWritten=newList<WriteData>();
 publicDictionary<string,List<byte[]>>ExpectedRead=newDictionary<string,List<byte[]>>();
+// Maps a string we get as a write to a return packet. Mostly used for Lovense.
+publicDictionary<string,byte[]>ExpectedNotify=newDictionary<string,byte[]>();
 
 publiceventEventHandlerValueWritten;
 
@@ -56,6 +59,11 @@ public void AddExpectedRead(string aCharacteristicIndex, byte[] aValue)
 ExpectedRead[aCharacteristicIndex].Add(aValue);
 }
 
+publicvoidAddExpectedNotify(stringaNotifyStr,byte[]aValue)
+{
+ExpectedNotify.Add(aNotifyStr,aValue);
+}
+
 publicoverrideTaskWriteValueAsyncInternal(byte[]aValue,
 ButtplugDeviceWriteOptionsaOptions,
 CancellationTokenaToken=default(CancellationToken))
@@ -67,6 +75,19 @@ public override Task WriteValueAsyncInternal(byte[] aValue,
 WriteWithResponse=aOptions.WriteWithResponse,
 });
 ValueWritten?.Invoke(this,newEventArgs());
+try
+{
+varvalueStr=Encoding.UTF8.GetString(aValue,0,aValue.Length);
+if(ExpectedNotify.ContainsKey(valueStr))
+{
+InvokeDataReceived(newButtplugDeviceDataEventArgs("tx",ExpectedNotify[valueStr]));
+}
+}
+catch
+{
+// noop.
+}
+
 returnTask.CompletedTask;
 }