diff --git a/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb b/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb index 3d20b3ab59d68a4d1f55da6c3ecfb6088c9a34f5..ab6dc1c74856350145424d8460ff089c11e01f3a 100644 --- a/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb +++ b/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb @@ -55,10 +55,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency= If( auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1>1, 1, auxNow.ElectricalUserInputsConfig.AlternatorGearEfficiency+0.1) + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -70,10 +71,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.AlternatorMap = auxNow.ElectricalUserInputsConfig.AlternatorMap & "X" + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -85,10 +87,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.DoorActuationTimeSecond+=1 + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -100,10 +103,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items.RemoveAt(0) + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -115,10 +119,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).AvgConsumptionAmps+=1 + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -130,10 +135,11 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle= NOT auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).BaseVehicle + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -145,11 +151,12 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act Dim cat As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).Category= cat & "x" + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -161,11 +168,12 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act Dim cname As String = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).ConsumerName= cName & "x" + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub @@ -177,15 +185,15 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NominalConsumptionAmps+=1 + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub - '******************** <Test()> <Category("ElectricalUserConfig")> _ Public Sub ElectricalUserConfig_Unequal_Consumers_NumberInActualVehicle_UnequalTest() @@ -194,11 +202,12 @@ Public Class AuxilaryComparisonTests Dim auxFresh = New AuxillaryEnvironment("") Dim auxNow = New AuxillaryEnvironment("") Dim compareResult As Boolean - - 'Act Dim cname As single = auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle auxNow.ElectricalUserInputsConfig.ElectricalConsumers.Items(0).NumberInActualVehicle+=1 + 'Act + compareResult = auxFresh.ConfigValuesAreTheSameAs( auxNow ) + Assert.AreEqual( false,compareResult ) End Sub