diff --git a/Weather/Models/MessageType.cs b/Weather/Models/MessageType.cs index c5d0072..aa42183 100644 --- a/Weather/Models/MessageType.cs +++ b/Weather/Models/MessageType.cs @@ -8,4 +8,4 @@ namespace ChrisKaczor.HomeMonitor.Weather.Models Text, Data } -} +} \ No newline at end of file diff --git a/Weather/Models/Models.csproj b/Weather/Models/Models.csproj index b864737..9cafbf3 100644 --- a/Weather/Models/Models.csproj +++ b/Weather/Models/Models.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/Weather/Models/WeatherReading.cs b/Weather/Models/WeatherReading.cs index 269a0b4..9ad6237 100644 --- a/Weather/Models/WeatherReading.cs +++ b/Weather/Models/WeatherReading.cs @@ -39,4 +39,4 @@ namespace ChrisKaczor.HomeMonitor.Weather.Models public DateTimeOffset GpsTimestamp { get; set; } } -} +} \ No newline at end of file diff --git a/Weather/Models/WindDirection.cs b/Weather/Models/WindDirection.cs index b119bbb..294a70a 100644 --- a/Weather/Models/WindDirection.cs +++ b/Weather/Models/WindDirection.cs @@ -23,4 +23,4 @@ namespace ChrisKaczor.HomeMonitor.Weather.Models WestNorthWest, NorthNorthWest } -} +} \ No newline at end of file diff --git a/Weather/ModelsTests/ModelsTests.csproj b/Weather/ModelsTests/ModelsTests.csproj index c4b56e8..75bc265 100644 --- a/Weather/ModelsTests/ModelsTests.csproj +++ b/Weather/ModelsTests/ModelsTests.csproj @@ -1,16 +1,16 @@ - net5.0 + net8.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Weather/ModelsTests/WeatherMessageTests.cs b/Weather/ModelsTests/WeatherMessageTests.cs index b1ba1c5..21a2ffd 100644 --- a/Weather/ModelsTests/WeatherMessageTests.cs +++ b/Weather/ModelsTests/WeatherMessageTests.cs @@ -1,33 +1,32 @@ -using System; -using ChrisKaczor.HomeMonitor.Weather.Models; +using ChrisKaczor.HomeMonitor.Weather.Models; using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; -namespace ModelsTests +namespace ModelsTests; + +[TestClass] +public class WeatherMessageTests { - [TestClass] - public class WeatherMessageTests + [TestMethod] + public void ParseTest() { - [TestMethod] - public void ParseTest() - { - var weatherMessage = WeatherMessage.Parse("$,ws=1.80,wg=1.15,wd=180.00,r=0.01,bt=14.44,bp=1016.76,tl=597.83,st=9.68,sh=78.95,gf=1,gs=13,glt=42.764725,gln=-71.042038,ga=20.70,gth=22,gtm=20,gts=11,gdy=21,gdm=5,gdd=28,#"); + var weatherMessage = WeatherMessage.Parse("$,ws=1.80,wg=1.15,wd=180.00,r=0.01,bt=14.44,bp=1016.76,tl=597.83,st=9.68,sh=78.95,gf=1,gs=13,glt=42.764725,gln=-71.042038,ga=20.70,gth=22,gtm=20,gts=11,gdy=21,gdm=5,gdd=28,#"); - Assert.AreEqual(MessageType.Data, weatherMessage.Type); + Assert.AreEqual(MessageType.Data, weatherMessage.Type); - Assert.AreEqual(WindDirection.South, weatherMessage.WindDirection); - Assert.AreEqual(1.80M, weatherMessage.WindSpeed); - Assert.AreEqual(42.764725M, weatherMessage.Latitude); - Assert.AreEqual(-71.042038M, weatherMessage.Longitude); - Assert.AreEqual(1016.76M, weatherMessage.Pressure); - Assert.AreEqual(14.44M, weatherMessage.PressureTemperature); - Assert.AreEqual(0.01M, weatherMessage.Rain); - Assert.AreEqual(9.68M, weatherMessage.HumidityTemperature); - Assert.AreEqual(78.95M, weatherMessage.Humidity); - Assert.AreEqual(13, weatherMessage.SatelliteCount); - Assert.AreEqual(20.70M, weatherMessage.Altitude); - Assert.AreEqual(1.80M, weatherMessage.WindSpeed); - Assert.AreEqual(597.83M, weatherMessage.LightLevel); - Assert.AreEqual(DateTimeOffset.Parse("2021-05-28 22:20:11 +00:00"), weatherMessage.GpsTimestamp); - } + Assert.AreEqual(WindDirection.South, weatherMessage.WindDirection); + Assert.AreEqual(1.80M, weatherMessage.WindSpeed); + Assert.AreEqual(42.764725M, weatherMessage.Latitude); + Assert.AreEqual(-71.042038M, weatherMessage.Longitude); + Assert.AreEqual(1016.76M, weatherMessage.Pressure); + Assert.AreEqual(14.44M, weatherMessage.PressureTemperature); + Assert.AreEqual(0.01M, weatherMessage.Rain); + Assert.AreEqual(9.68M, weatherMessage.HumidityTemperature); + Assert.AreEqual(78.95M, weatherMessage.Humidity); + Assert.AreEqual(13, weatherMessage.SatelliteCount); + Assert.AreEqual(20.70M, weatherMessage.Altitude); + Assert.AreEqual(1.80M, weatherMessage.WindSpeed); + Assert.AreEqual(597.83M, weatherMessage.LightLevel); + Assert.AreEqual(DateTimeOffset.Parse("2021-05-28 22:20:11 +00:00"), weatherMessage.GpsTimestamp); } } \ No newline at end of file