From db3491ecba84fc37d5e5d31063e20bd3d4c789c1 Mon Sep 17 00:00:00 2001 From: dotMorten Date: Thu, 3 Oct 2019 00:15:16 -0700 Subject: [PATCH] Fixed bug introduced by nullable changes --- src/NmeaParser/NmeaDevice.cs | 8 ++++---- src/UnitTests/NmeaParser.Tests/DeviceTests.cs | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/NmeaParser/NmeaDevice.cs b/src/NmeaParser/NmeaDevice.cs index 2ac3d98..7ad7b77 100644 --- a/src/NmeaParser/NmeaDevice.cs +++ b/src/NmeaParser/NmeaDevice.cs @@ -214,8 +214,8 @@ namespace NmeaParser } } } - if (messageParts != null) - MessageReceived?.Invoke(this, new NmeaMessageReceivedEventArgs(msg, messageParts)); + + MessageReceived?.Invoke(this, new NmeaMessageReceivedEventArgs(msg, messageParts)); } private readonly Dictionary> MultiPartMessageCache = new Dictionary>(); @@ -289,7 +289,7 @@ namespace NmeaParser /// public sealed class NmeaMessageReceivedEventArgs : EventArgs { - internal NmeaMessageReceivedEventArgs(Nmea.NmeaMessage message, IReadOnlyList messageParts) + internal NmeaMessageReceivedEventArgs(Nmea.NmeaMessage message, IReadOnlyList? messageParts) { Message = message; MessageParts = messageParts; @@ -317,6 +317,6 @@ namespace NmeaParser /// /// The message parts. /// - public IReadOnlyList MessageParts { get; } + public IReadOnlyList? MessageParts { get; } } } diff --git a/src/UnitTests/NmeaParser.Tests/DeviceTests.cs b/src/UnitTests/NmeaParser.Tests/DeviceTests.cs index d4a61f7..ae045ea 100644 --- a/src/UnitTests/NmeaParser.Tests/DeviceTests.cs +++ b/src/UnitTests/NmeaParser.Tests/DeviceTests.cs @@ -13,6 +13,7 @@ namespace NmeaParser.Tests { [TestMethod] [TestCategory("Device")] + [Timeout(2000)] public async Task TestGpgsvGroupMessage() { var message = "$GPGSV,3,1,9,00,30,055,48,00,19,281,00,27,19,275,00,12,16,319,00*4C\n$GPGSV,3,2,9,00,30,055,48,00,19,281,00,27,19,275,00,12,16,319,00*4F\n$GPGSV,3,3,9,32,10,037,00,,,,,,,,,,,,*74"; @@ -50,6 +51,7 @@ namespace NmeaParser.Tests [TestMethod] [TestCategory("Device")] + [Timeout(2000)] public async Task TestMixedGsvGroupMessage() { // A group message can have multiple diffent GSV types. @@ -100,7 +102,8 @@ $GAGSV,4,4,14,19,82,349,40,1,44,220,40,4,24,314,38*5F"; [TestMethod] [TestCategory("Device")] - public async Task TestInvalidGpgsvGroupMessage() + [Timeout(2000)] + public async Task TestInvalidGpgsvGroupMessage() { var message = "$GPGSV,3,2,9,00,30,055,48,00,19,281,00,27,19,275,00,12,16,319,00*4D\n$GPGSV,3,2,9,00,30,055,48,00,19,281,00,27,19,275,00,12,16,319,00*4F\n$GPGSV,3,3,9,32,10,037,00,,,,,,,,,,,,*74"; NmeaDevice dev = new BufferedStringDevice(message);