More tests and better boat data

Author: smasherprog

EQTool/ViewModels/SpellWindowViewModel.cs

@@ -257,9 +257,10 @@ public void UpdateSpells(double dt_ms)
                 }
 
                 var boats = this._SpellList.Where(a => a.SpellViewModelType == SpellViewModelType.Boat).Cast<BoatViewModel>().ToList();
+                var boatslist = new List<Boats>() { Boats.BarrelBarge, Boats.NroIcecladBoat };
                 foreach (var boat in boats)
                 { 
-                    if(boat.Boat == Boats.BarrelBarge)
+                    if(boatslist.Contains(boat.Boat))
                     {
                         boat.TotalRemainingDuration = boat.TotalRemainingDuration.Subtract(TimeSpan.FromMilliseconds(dt_ms));
                         if (boat.TotalRemainingDuration.TotalSeconds <= 0)

EQToolShared/Zones.cs

@@ -147,16 +147,18 @@ static Zones()
                 Boat = EQToolShared.Boats.NroIcecladBoat,
                 StartPoint = "nro",
                 StartAnnoucement = "Frankel the Pirate says 'Thar she be mates. All aboard thats goin aboard!'",
+                AnnouncementToDockInSeconds =0,
                 EndPoint = "iceclad",
-                TripTimeInSeconds = 395
+                TripTimeInSeconds = 518
             });
             Boats.Add(new BoatInfo
             {
                 Boat = EQToolShared.Boats.NroIcecladBoat,
+                AnnouncementToDockInSeconds = 307,
                 StartPoint = "iceclad",
                 StartAnnoucement = string.Empty,
                 EndPoint = "nro",
-                TripTimeInSeconds = 124
+                TripTimeInSeconds = 518
             });
             ZoneInfoMap.Add("airplane", new ZoneInfo
             {

EQtoolsTests/BoatScheduleTests.cs

@@ -35,7 +35,7 @@ public BoatScheduleTests()
         }
 
         [TestMethod]
-        public void HappyTimeNotPassed()
+        public void HappyTimeNotPassedOasis()
         {
             var d = DateTimeOffset.Now;
             var boat = new BoatActivityResponce
@@ -71,5 +71,24 @@ public void HappyTimePassedOasis()
             Assert.AreEqual((int)startBoat.TotalRemainingDuration.TotalSeconds, 698, 1);
             Assert.AreEqual((int)endBoat.TotalRemainingDuration.TotalSeconds, 310, 1);
         }
+
+        [TestMethod]
+        public void HappyTimeNro()
+        {
+            var d = DateTimeOffset.Now;
+            var boat = new BoatActivityResponce
+            {
+                Boat = EQToolShared.Boats.NroIcecladBoat,
+                LastSeen = d.AddSeconds(-10),
+                StartPoint = "nro"
+            };
+            this.boatScheduleService.UpdateBoatInformation(boat, boatViewModelList);
+            var startZoneBoat = Zones.Boats.FirstOrDefault(a => a.Boat == boat.Boat && a.StartPoint == boat.StartPoint);
+            var endZoneBoat = Zones.Boats.FirstOrDefault(a => a.Boat == boat.Boat && a.StartPoint == startZoneBoat.EndPoint);
+            var startBoat = boatViewModelList.FirstOrDefault(a => a.Boat == boat.Boat && a.Name.StartsWith(boat.StartPoint));
+            var endBoat = boatViewModelList.FirstOrDefault(a => a.Boat == boat.Boat && a.Name.StartsWith(startZoneBoat.EndPoint));
+            Assert.AreEqual((int)startBoat.TotalRemainingDuration.TotalSeconds, 508, 1);
+            Assert.AreEqual((int)endBoat.TotalRemainingDuration.TotalSeconds, 297, 1);
+        }
     }
 }