From a63658c80418621a9acbdc772d8f76f707af0dbc Mon Sep 17 00:00:00 2001
From: James Hughes <james@pyrosoftsolutions.co.uk>
Date: Mon, 6 May 2024 22:24:58 +0100
Subject: [PATCH] Moved tests into the correct project and removed errant
 references

---
 .../Models/BuiltTests.cs                      |  4 ++--
 .../Models/DiveComputerAlarmTests.cs          |  6 ++---
 .../Models/ExposureToAltitudeTests.cs         |  2 +-
 .../Models/GlobalAlarmsTests.cs               |  2 +-
 .../Models/LaunchingDateTests.cs              | 23 +++++++++++++++++++
 .../Models/SetDiveComputerAlarmTimeTests.cs   |  6 ++---
 .../Models/SetDiveComputerDecoModelTests.cs   |  2 +-
 .../Models/ShipDimensionTests.cs              |  6 ++---
 .../Models/WreckTests.cs                      |  4 ++--
 .../Models/LaunchingDate.cs                   |  4 ++--
 .../UniversalDiveDataFormat.csproj            |  6 -----
 11 files changed, 41 insertions(+), 24 deletions(-)
 rename src/{UniversalDiveDataFormat => UniversalDiveDataFormat.Tests}/Models/BuiltTests.cs (89%)
 rename src/{UniversalDiveDataFormat => UniversalDiveDataFormat.Tests}/Models/DiveComputerAlarmTests.cs (85%)
 create mode 100644 src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
 rename src/{UniversalDiveDataFormat => UniversalDiveDataFormat.Tests}/Models/SetDiveComputerAlarmTimeTests.cs (85%)
 rename src/{UniversalDiveDataFormat => UniversalDiveDataFormat.Tests}/Models/ShipDimensionTests.cs (86%)
 rename src/{UniversalDiveDataFormat => UniversalDiveDataFormat.Tests}/Models/WreckTests.cs (95%)

diff --git a/src/UniversalDiveDataFormat/Models/BuiltTests.cs b/src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
similarity index 89%
rename from src/UniversalDiveDataFormat/Models/BuiltTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
index 4774942..35a2b43 100644
--- a/src/UniversalDiveDataFormat/Models/BuiltTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/BuiltTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class BuiltTests
 {
diff --git a/src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs b/src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
similarity index 85%
rename from src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
index 795363c..aff945f 100644
--- a/src/UniversalDiveDataFormat/Models/DiveComputerAlarmTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/DiveComputerAlarmTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class DiveComputerAlarmTests
 {
@@ -23,6 +23,6 @@ public void CanReadDcAlarm()
 		DiveComputerAlarm dcAlarm = serializer.Deserialize<DiveComputerAlarm>(Xml);
 		dcAlarm.PeriodInSeconds.ShouldBe(10.0f);
 		dcAlarm.AlarmType.ShouldBe(1);
-		dcAlarm.Acknowledge.ShouldBeNull();
+		dcAlarm.Acknowledge.ShouldNotBeNull();
 	}
 }
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs b/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
index bab50ef..66586c0 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/ExposureToAltitudeTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ExposureToAltitudeTests
 {
diff --git a/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs b/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
index 8ea52cb..2d9134d 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/GlobalAlarmsTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class GlobalAlarmsTests
 {
diff --git a/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs b/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
new file mode 100644
index 0000000..8a3bee3
--- /dev/null
+++ b/src/UniversalDiveDataFormat.Tests/Models/LaunchingDateTests.cs
@@ -0,0 +1,23 @@
+using System.Xml.Serialization;
+using Shouldly;
+using UniversalDiveDataFormat.ExtensionMethods;
+using UniversalDiveDataFormat.Models;
+
+namespace UniversalDiveDataFormat.Tests.Models;
+
+public class LaunchingDateTests
+{
+	private const string Xml = """
+	                           <launchingdate>
+	                               <datetime>1943-06-14</datetime>
+	                           </launchingdate>
+	                           """;
+	
+	[Fact]
+	public void CanReadLaunchingDate()
+	{
+		XmlSerializer serializer = new(typeof(LaunchingDate));
+		LaunchingDate launchingDate = serializer.Deserialize<LaunchingDate>(Xml);
+		launchingDate.DateTime.ShouldBe(new(1943, 6, 14));
+	}
+}
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
similarity index 85%
rename from src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
index 6a3b448..5827a2a 100644
--- a/src/UniversalDiveDataFormat/Models/SetDiveComputerAlarmTimeTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerAlarmTimeTests.cs
@@ -1,15 +1,15 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerAlarmTimeTests
 {
 	private const string Xml = """
 	                           <setdcalarmtime>
-	                               <datetime>T14:37:00</datetime>
+	                               <datetime>2022-01-01T14:37:00</datetime>
 	                               <dcalarm>
 	                                   <!-- duration 10 seconds -->
 	                                   <period>10.0</period>
diff --git a/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
index cbdcd1d..68a1e93 100644
--- a/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/SetDiveComputerDecoModelTests.cs
@@ -3,7 +3,7 @@
 using UniversalDiveDataFormat.ExtensionMethods;
 using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Tests;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class SetDiveComputerDecoModelTests
 {
diff --git a/src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs b/src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
similarity index 86%
rename from src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
index 899465b..93e8716 100644
--- a/src/UniversalDiveDataFormat/Models/ShipDimensionTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/ShipDimensionTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class ShipDimensionTests
 {
@@ -13,7 +13,7 @@ public class ShipDimensionTests
 	                               <beam>12.6</beam>
 	                               <draught>5.7</draught>
 	                               <displacement>123456.7</displacement>
-	                               <tonnage>170000.0</tonnag>
+	                               <tonnage>170000.0</tonnage>
 	                           </shipdimension>
 	                           """;
 	
diff --git a/src/UniversalDiveDataFormat/Models/WreckTests.cs b/src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
similarity index 95%
rename from src/UniversalDiveDataFormat/Models/WreckTests.cs
rename to src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
index a6871dd..645e933 100644
--- a/src/UniversalDiveDataFormat/Models/WreckTests.cs
+++ b/src/UniversalDiveDataFormat.Tests/Models/WreckTests.cs
@@ -1,9 +1,9 @@
 using System.Xml.Serialization;
 using Shouldly;
 using UniversalDiveDataFormat.ExtensionMethods;
-using Xunit;
+using UniversalDiveDataFormat.Models;
 
-namespace UniversalDiveDataFormat.Models;
+namespace UniversalDiveDataFormat.Tests.Models;
 
 public class WreckTests
 {
diff --git a/src/UniversalDiveDataFormat/Models/LaunchingDate.cs b/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
index 5e04631..93f52f5 100644
--- a/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
+++ b/src/UniversalDiveDataFormat/Models/LaunchingDate.cs
@@ -2,9 +2,9 @@
 
 namespace UniversalDiveDataFormat.Models;
 
-[XmlRoot("LaunchingDate")]
+[XmlRoot("launchingdate")]
 public class LaunchingDate
 {
 	[XmlElement("datetime")]
-	public DateTime? DateTime { get; init; }
+	public DateTime DateTime { get; init; }
 }
\ No newline at end of file
diff --git a/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj b/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
index 8174b09..b2260e3 100644
--- a/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
+++ b/src/UniversalDiveDataFormat/UniversalDiveDataFormat.csproj
@@ -18,12 +18,6 @@
 
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
-    <Reference Include="Shouldly">
-      <HintPath>..\..\..\..\.nuget\packages\shouldly\4.2.1\lib\net5.0\Shouldly.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\..\.nuget\packages\xunit.extensibility.core\2.4.2\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
 </Project>