From 0a8580d019243fc8829cfcf752b3896f62d3579e Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Sun, 24 Jul 2022 21:01:49 +0200
Subject: [PATCH] adding files to project
---
VECTO3GUI2020/VECTO3GUI2020.csproj | 2 +-
VectoCore/VectoXML.spp | 23 +++++++++++++++++++
.../VectoMockupTest/MockUpVectoTest.cs | 7 +++---
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index b523e4d257..08d0db1538 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -10,7 +10,7 @@
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
- <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<DefineConstants />
<Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
</PropertyGroup>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 21e33376d1..189d253ac3 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -153,6 +153,29 @@
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_full.xml" HomeFolder="Yes"/>
<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\SchemaVersionMultistage.0.1\vecto_multistage_primary_vehicle_stage_2_mandatory.xml" HomeFolder="Yes"/>
</Folder>
+ <Folder FolderName="MockupResults">
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_Conv_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_non-OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\CIF_MockupResults_PEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Conv_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_Error.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_non-OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_OVC-HEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\MRF_MockupResults_PEV_Lorry.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_Conv_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_non-OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_OVC-HEV_Bus.xml" HomeFolder="Yes"/>
+ <File FilePath="..\VectoMockup\VectoMockup\MockupResults\VIF_MockupResults_PEV_Bus.xml" HomeFolder="Yes"/>
+ </Folder>
</Folder>
<Folder FolderName="XML Files Vecto Testcases">
<Folder FolderName="SchemaVersion2.4" ExtStr=".xml">
diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
index a8141bf0bd..ef8e16b4d4 100644
--- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
+++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
@@ -74,6 +74,7 @@ namespace VectoMockupTest
protected const string HEV_Px_PrimaryBus_SuperCap = BasePathMockup + @"PrimaryBus\HEV_primaryBus_AMT_Px_SuperCap.xml";
protected const string HEV_S2_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_AMT_S2.xml";
protected const string HEV_S2_PrimaryBus_GenSetADC = BasePathMockup + @"PrimaryBus\HEV-S_primaryBus_AMT_S2_GenSetADC.xml";
+ protected const string HEV_S2_PrimaryBus_ADC = BasePathMockup + @"PrimaryBus\HEV-S_primaryBus_AMT_S2_ADC.xml";
protected const string HEV_S3_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_S3.xml";
protected const string HEV_S4_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_S4.xml";
protected const string HEV_IEPC_S_PrimaryBus = BasePath + @"PrimaryBus\HEV-S_primaryBus_IEPC-S.xml";
@@ -97,9 +98,8 @@ namespace VectoMockupTest
#region Interim Bus Input
protected const string Conventional_InterimBusInput = BasePathMockup + @"CompletedBus\Conventional_InterimBus_Min.xml";
- protected const string Conventional_InterimBusInput_AirdragV10 = BasePathMockup + @"CompletedBus\Conventional_InterimBus_AirdragV10.xml";
- protected const string Conventional_InterimBusInput_AirdragV20 = BasePathMockup + @"CompletedBus\Conventional_InterimBus_AirdragV23.xml";
- protected const string Conventional_InterimBusInput_AirdragV24 = BasePathMockup + @"CompletedBus\Conventional_InterimBus_AirdragV24.xml";
+ protected const string Conventional_InterimBusInput_AirdragV10 = BasePathMockup + @"CompletedBus\Conventional_completedBus_AirdragV10.xml";
+ protected const string Conventional_InterimBusInput_AirdragV20 = BasePathMockup + @"CompletedBus\Conventional_completedBus_AirdragV20.xml";
protected const string HEV_InterimBusInput = BasePathMockup + @"CompletedBus\HEV_InterimBus_Min.xml";
protected const string PEV_InterimBusInput = BasePathMockup + @"CompletedBus\PEV_InterimBus_Min.xml";
protected const string PEV_IEPC_InterimBusInput = BasePathMockup + @"CompletedBus\IEPC_InterimBus_Min.xml";
@@ -248,6 +248,7 @@ namespace VectoMockupTest
[TestCase(HEV_Px_PrimaryBus_SuperCap, TestName = "HEV_Px_PrimaryBus_SuperCap")]
[TestCase(HEV_S2_PrimaryBus, TestName="HEV_S2_PrimaryBus")]
[TestCase(HEV_S2_PrimaryBus_GenSetADC, TestName = "HEV_S2_PrimaryBus_GenSetADC")]
+ [TestCase(HEV_S2_PrimaryBus_ADC, TestName = "HEV_S2_PrimaryBus_ADC")]
[TestCase(HEV_S3_PrimaryBus, TestName = "HEV_S3_PrimaryBus")]
[TestCase(HEV_S4_PrimaryBus, TestName = "HEV_S4_PrimaryBus")]
[TestCase(PEV_E2_PrimaryBus, TestName="PEV_E2_PrimaryBus")]
--
GitLab