Merge branch... (7dc1197e) · Commits · Stefanos DOUMPOULAKIS / Vecto

Commit 7dc1197e authored 2 years ago by Markus Quaritsch

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

# Conflicts:
#	VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed/IEPCVehicle_Gbx3.vveh

parents 183c0a8c f8ab9029

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh 1 addition, 1 deletion

...PEV/GenericVehicleB4/BatteryElectricVehicle_Cont30kW.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh 1 addition, 1 deletion

...PEV/GenericVehicleE2/BatteryElectricVehicle_Cont30kW.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh 1 addition, 1 deletion

...JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh 1 addition, 1 deletion

.../GenericVehicleE2/BatteryElectricVehicle_PTO_invalid.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh 1 addition, 1 deletion

...ode/JSON/PEV/GenericVehicleE4/BatteryElectricVehicle.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_.vecto 0 additions, 0 deletions

...Mode/JSON/P_HEV/Group2_P2/Class2_RigidTruck_ParHyb_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_.vecto 0 additions, 0 deletions

.../JSON/P_HEV/Hyb_P2_Group2/Class2_RigidTruck_ParHyb_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Hyb_P2_Group2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto 0 additions, 0 deletions

...2SuperCapOvl/Class2_RigidTruck_ParHyb_SuperCap_Ovl_.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto 0 additions, 0 deletions

...GenericIEPC-S/IEPC-S_Gbx1Speed+Axle/IEPC-S__Gbx1Axl.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S__Gbx1Whl1.vecto 0 additions, 0 deletions

...enericIEPC-S/IEPC-S_Gbx1Speed-Whl1/IEPC-S__Gbx1Whl1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S__Gbx1Whl2.vecto 0 additions, 0 deletions

...enericIEPC-S/IEPC-S_Gbx1Speed-Whl2/IEPC-S__Gbx1Whl2.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S__Gbx1.vecto 0 additions, 0 deletions

...N/S_HEV/GenericIEPC-S/IEPC-S_Gbx1Speed/IEPC-S__Gbx1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S__Gbx3Axl.vecto 0 additions, 0 deletions

...GenericIEPC-S/IEPC-S_Gbx3Speed+Axle/IEPC-S__Gbx3Axl.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto 0 additions, 0 deletions

...enericIEPC-S/IEPC-S_Gbx3Speed-Whl1/IEPC-S__Gbx3Whl1.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S__Gbx3Whl2.vecto 0 additions, 0 deletions

...enericIEPC-S/IEPC-S_Gbx3Speed-Whl2/IEPC-S__Gbx3Whl2.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3.vecto 0 additions, 0 deletions

...N/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3_drag.vecto 0 additions, 0 deletions

...EV/GenericIEPC-S/IEPC-S_Gbx3Speed/IEPC-S__Gbx3_drag.vecto
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_.vecto 0 additions, 0 deletions

...ationMode/2nd_AmendmDeclMode/JSON/S_HEV/S2_Job/BEV_.vecto

with 6 additions and 6 deletions

Please register or to comment