Merge branch...

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs

@@ -1190,7 +1190,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient,
 			bool prohibitOverspeed = false)
 		{
-			if (DataBus.VehicleInfo.VehicleSpeed.IsSmaller(DriverStrategy.BrakeTrigger.NextTargetSpeed, Constants.SimulationSettings.BrakeTriggerSpeedTolerance)
+            //If we have reached the target speed exactly we stop breaking
+
+            //if (DataBus.VehicleInfo.VehicleSpeed.IsSmaller(DriverStrategy.BrakeTrigger.NextTargetSpeed, Constants.SimulationSettings.BrakeTriggerSpeedTolerance)
+			if (DataBus.VehicleInfo.VehicleSpeed <= DriverStrategy.BrakeTrigger.NextTargetSpeed
 				&& !DataBus.VehicleInfo.VehicleStopped) {
 				var retVal = HandleTargetspeedReached(absTime, ds, targetVelocity, gradient);
 				for (var i = 0; i < 3 && retVal == null; i++) {

VectoCore/VectoCoreTest/Integration/BatteryElectric/BEVTimeRunTest.cs

@@ -178,7 +178,9 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 
 			Assert.IsTrue(run.FinishedWithoutErrors);
 			
+            
             string distanceSumPath = Path.Combine(Path.GetDirectoryName(jobFile), "distance.vsum");
+            TestContext.WriteLine($"Comparing with results from {distanceSumPath}");
 			AssertHelper.ReportDeviations(distanceSumPath, distanceCycleIdx, factory, metrics);
             
             AssertHelper.AssertMetrics(factory, metrics);
@@ -202,7 +204,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 			Assert.IsTrue(run.FinishedWithoutErrors);
 			
             string distanceSumPath = Path.Combine(Path.GetDirectoryName(jobFile), "distance.vsum");
-
+			TestContext.WriteLine($"Comparing with results from {distanceSumPath}");
             const int DISTANCE_RUN_START_POSITION = 3;
 
             AssertHelper.ReadMetricsFromVSum(distanceSumPath, cycleIdx - DISTANCE_RUN_START_POSITION, metrics);

VectoCore/VectoCoreTest/Utils/AssertHelper.cs

@@ -146,7 +146,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 					continue;
 				}
 				if (propertyType.IsPrimitive || propertyType == typeof(string)) {
-					Assert.AreEqual(expectedVal, actualVal);
+					Assert.AreEqual(expectedVal, actualVal, $"Property {prop.Name}, expected: {expectedVal}, actual: {actualVal}");
 				} else if (propertyType == typeof(SI)) {
 					Assert.AreEqual((expectedVal as SI).Value(), (actualVal as SI).Value());
 					Assert.AreEqual((expectedVal as SI).UnitString, (actualVal as SI).UnitString);