From e253f7a725913f93a168fda925210c4867cf2528 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Mon, 4 Oct 2021 11:56:21 +0200
Subject: [PATCH] renamed HashPreviousStage to HashPreviousStep
---
.../completed_heavyBus_31b.VIF_Report_2.xml | 4 ++--
.../completed_heavyBus_34f.VIF_Report_2.xml | 4 ++--
.../completed_heavyBus_39a.VIF_Report_2.xml | 4 ++--
.../ManufacturingStageViewModel_v0_1.cs | 8 ++++----
...ultistage_conventional_final_vif.VIF_Report_1.xml | 4 ++--
.../VectoCommon/InputData/DeclarationInputData.cs | 2 +-
.../VectoCommon/Resources/XMLNames.Designer.cs | 9 +++++++++
VectoCommon/VectoCommon/Resources/XMLNames.resx | 3 +++
.../XMLDeclarationMultistageInputData.cs | 4 ++--
.../Impl/XMLDeclarationMultistageInputReader.cs | 2 +-
.../VehicleInformationFile/XMLMultistageBusReport.cs | 2 +-
.../Resources/XSD/VectoOutputMultistage.0.1.xsd | 2 +-
.../Integration/Multistage/MultistageVehicleTest.cs | 6 +++---
.../FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml | 4 ++--
.../SchemaVersion1.0/test.VIF_Report_2.xml | 4 ++--
.../exempted_completed.VIF_Report_2.xml | 4 ++--
...vecto_multistage_consolidated_multiple_stages.xml | 12 ++++++------
...age_consolidated_multiple_stages_NGTankSystem.xml | 12 ++++++------
...ltistage_consolidated_multiple_stages_airdrag.xml | 12 ++++++------
...tistage_consolidated_multiple_stages_heatPump.xml | 12 ++++++------
...o_multistage_consolidated_multiple_stages_hev.xml | 12 ++++++------
...o_multistage_consolidated_multiple_stages_vif.xml | 8 ++++----
.../vecto_multistage_consolidated_one_stage.xml | 4 ++--
.../vecto_multistage_consolidated_two_stages.xml | 8 ++++----
...ultistage_conventional_final_vif.VIF_Report_1.xml | 4 ++--
.../vecto_multistage_primary_vehicle_stage_2_3.xml | 8 ++++----
..._multistage_primary_vehicle_stage_2_3_group41.xml | 8 ++++----
...vecto_multistage_primary_vehicle_stage_2_full.xml | 4 ++--
..._multistage_primary_vehicle_stage_2_mandatory.xml | 4 ++--
.../VectoCoreTest/XML/XMLMultistageBusDataTest.cs | 6 +++---
.../FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml | 4 ++--
31 files changed, 98 insertions(+), 86 deletions(-)
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
index 7181a7636b..2842852a64 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
@@ -573,7 +573,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-aec22451f48f47c484ac">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-88dcf76d37a64b5eaf70">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -582,7 +582,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>4MFxDdYDnYyRrUdyIPFhEYwbyqqJl3MlYtXMaB/RQis=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-273285e977014470902e" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
index 6df32a71f3..07631a3ccc 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
@@ -604,7 +604,7 @@
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-607e449d2b0e45228b69">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-7f30aafa027a41a1864b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -613,7 +613,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>a3ai89pd92w4O1za7mc+ut712QqNJqAfX0FeeZdfrFk=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-684dbf252718426b9fde" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
index 5b0e9b949a..0fc0aab1a4 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
@@ -578,7 +578,7 @@
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-9d0c3a409fce4a89a6ce">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-10652bf49ae0499f8689">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -587,7 +587,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="VEH-f34a4a8615eb4037a7b7">
<v2.8:Manufacturer>Some Manufacturer</v2.8:Manufacturer>
<v2.8:ManufacturerAddress>Infinite Loop 1</v2.8:ManufacturerAddress>
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
index a281537272..629a89884c 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
@@ -20,10 +20,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
public class ManufacturingStageViewModel_v0_1 : StageViewModelBase, IManufacturingStageViewModel
{
- public DigestData HashPreviousStage
+ public DigestData HashPreviousStep
{
- get => _hashPreviousStage;
- set => SetProperty(ref _hashPreviousStage, value);
+ get => _hashPreviousStep;
+ set => SetProperty(ref _hashPreviousStep, value);
}
public int StepCount
@@ -77,7 +77,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private int _stepCount;
- private DigestData _hashPreviousStage;
+ private DigestData _hashPreviousStep;
private IManufacturingStageInputData _consolidatedManufacturingStageInputData;
diff --git a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index ed80fbec00..a3c8e583b2 100644
--- a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -576,7 +576,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-622a60d3b3cf4340a362">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -585,7 +585,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>PMrdzQUpL67ALWFQpWjxSieZ4KQ2iqS2y4BmHV3nJ0g=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-09ab483f390a40d58f5a" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 325f5bf260..eddf2a1b27 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -980,7 +980,7 @@ namespace TUGraz.VectoCommon.InputData
public interface IManufacturingStageInputData
{
- DigestData HashPreviousStage { get; }
+ DigestData HashPreviousStep { get; }
int StepCount { get; }
IVehicleDeclarationInputData Vehicle { get; }
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 84724eb7cd..426f640199 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -2616,6 +2616,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to HashPreviousStep.
+ /// </summary>
+ public static string HashPreviousStep {
+ get {
+ return ResourceManager.GetString("HashPreviousStep", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Entry.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 507697b9da..4f377ed4ec 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1590,4 +1590,7 @@
<data name="BusManufacturingStepDataType" xml:space="preserve">
<value>BusManufacturingStepDataType</value>
</data>
+ <data name="HashPreviousStep" xml:space="preserve">
+ <value>HashPreviousStep</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index 8508ad1f6a..22d135b911 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -197,9 +197,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected override DataSourceType SourceType => DataSourceType.XMLFile;
- public DigestData HashPreviousStage =>
+ public DigestData HashPreviousStep =>
_hashPreviousStage ??
- (_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
+ (_hashPreviousStage = Reader.GetDigestData(GetNode(XMLNames.HashPreviousStep)));
public int StepCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStep_StepCount));
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index 90df3d6e78..e39e059835 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -439,7 +439,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
_primaryVehicle = primaryVehicle;
}
- public DigestData HashPreviousStage => _manufacturingStages.First().HashPreviousStage;
+ public DigestData HashPreviousStep => _manufacturingStages.First().HashPreviousStep;
public int StepCount => _manufacturingStages.First().StepCount;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index fd24ed6925..f6385c567b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -242,7 +242,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
digitData = _manufacturingStageInputData.Last().Signature;
}
- return new XElement(tns + "HashPreviousStage",
+ return new XElement(tns + XMLNames.HashPreviousStep,
digitData.ToXML(di));
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index f4b30701ae..a155c041fa 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -370,7 +370,7 @@
<xs:complexContent>
<xs:extension base="vif:AbstractManufacturingStepDataType">
<xs:sequence>
- <xs:element name="HashPreviousStage" type="v1.0:SignatureType"/>
+ <xs:element name="HashPreviousStep" type="v1.0:SignatureType"/>
<xs:element name="Vehicle" type="v2.10.2:AbstractCompletedBusVehicleType"/>
<xs:element name="ApplicationInformation" type="vif:ApplicationInformationPrimaryVehicleType"/>
</xs:sequence>
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index b54e72d3c2..7e12fbe409 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -168,7 +168,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage2Data(IManufacturingStageInputData data)
{
Assert.AreEqual(2, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
+ TestSignatureData(data.HashPreviousStep, "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
"#PIF-d10aff76c5d149948046");
Assert.AreEqual("Intermediate Manufacturer 1", data.Vehicle.Manufacturer);
@@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage3Data(IManufacturingStageInputData data)
{
Assert.AreEqual(3, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
+ TestSignatureData(data.HashPreviousStep, "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
"#RESULT-6f30c7fe665a47938f6b");
Assert.AreEqual("Intermediate Manufacturer 2", data.Vehicle.Manufacturer);
@@ -235,7 +235,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestVifStage4Data(IManufacturingStageInputData data)
{
Assert.AreEqual(4, data.StepCount);
- TestSignatureData(data.HashPreviousStage, "GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
+ TestSignatureData(data.HashPreviousStep, "GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
"#RESULT-8f30c7fe665a47938f6b");
Assert.AreEqual("Some Manufacturer", data.Vehicle.Manufacturer);
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index e5b5465e55..8300998e2e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -580,12 +580,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index ca35b00e49..cf1c3428be 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -564,7 +564,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</vif0.1:PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-ab066054c1bc431db1e3">
- <vif0.1:HashPreviousStage>
+ <vif0.1:HashPreviousStep>
<di:Reference URI="#PIF-4121ae4751874cefa376">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -573,7 +573,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>YnCPep7uMh3ghMrx6ZsEMLanOijFCZpku+ZDNd6rkLw=</di:DigestValue>
</di:Reference>
- </vif0.1:HashPreviousStage>
+ </vif0.1:HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-a00526e499f144139792" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
index 976884de24..453c23b32c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
@@ -59,7 +59,7 @@
</PrimaryVehicle>
<vif0.1:ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-4cb168560c0d4b3d886d">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -68,7 +68,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>KeeEnRNO5Gjm7XB+YYx542ujYbE0k7a9SkWe/BWo7bI=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle id="VEH-4e462a2a8acc408eb908" xsi:type="Vehicle_Exempted_CompletedBusDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Manufacturer</Manufacturer>
<ManufacturerAddress>Address </ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index 1faacae693..3e778f61f3 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 55d268b258..0aad732a98 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -642,7 +642,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -651,7 +651,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -692,7 +692,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -701,7 +701,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -763,7 +763,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -772,7 +772,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index cf23f71e7b..c52310c8f1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2" >
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -733,7 +733,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -742,7 +742,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -805,7 +805,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -814,7 +814,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index d798a2564d..ab6b189452 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 9a8b6efb9b..7cafae1e2c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -689,7 +689,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -698,7 +698,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
@@ -760,7 +760,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="4">
<Data xsi:type="BusManufacturingStepDataType" id="MST-3">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -769,7 +769,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-3-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 3</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 3</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 33809f1006..1e228731a1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index 81e09f72fa..2dc6642759 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 639d18fe1c..491e5cbf25 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -696,7 +696,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index 72114aaada..8307c7d639 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -576,7 +576,7 @@
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#VEH-622a60d3b3cf4340a362">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
@@ -585,7 +585,7 @@
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<di:DigestValue>PMrdzQUpL67ALWFQpWjxSieZ4KQ2iqS2y4BmHV3nJ0g=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="VEH-09ab483f390a40d58f5a" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 3553a2795b..6d73cb4475 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle">
<v2.10.2:Manufacturer>Intermediate Manufacturer 1</v2.10.2:Manufacturer>
<v2.10.2:ManufacturerAddress>Intermediate Manufacturer Address 1</v2.10.2:ManufacturerAddress>
@@ -676,7 +676,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -685,7 +685,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.10.2:Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 2</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 43f42aedf7..fac245ed6b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -574,7 +574,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -583,7 +583,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
@@ -609,7 +609,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</ManufacturingStep>
<ManufacturingStep stepCount="3">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-2">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -618,7 +618,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-2-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 2</Manufacturer>
<ManufacturerAddress></ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 9d93e30553..880e44fad7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d11aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 339950c3d2..2d88241971 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="BusManufacturingStepDataType" id="MSTG-1">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference URI="#PIF-d10aff76c5d149948046">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
@@ -650,7 +650,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
<di:DigestValue>nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=</di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" id="MSTG-1-Vehicle" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2">
<Manufacturer>Intermediate Manufacturer 1</Manufacturer>
<ManufacturerAddress>Intermediate Manufacturer Address 1</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index d5cdc47b14..c93fd2f604 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -547,7 +547,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2, manufacturingStage.StepCount);
TestDigestData("#PIF-d10aff76c5d149948046", "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
- manufacturingStage.HashPreviousStage);
+ manufacturingStage.HashPreviousStep);
TestVehicleDataStage01(manufacturingStage.Vehicle);
@@ -602,7 +602,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(3, manufacturingStage.StepCount);
TestDigestData("#RESULT-6f30c7fe665a47938f6b", "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
- manufacturingStage.HashPreviousStage);
+ manufacturingStage.HashPreviousStep);
TestVehicleDataStage02(manufacturingStage.Vehicle);
}
@@ -684,7 +684,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2, stageData.StepCount);
TestDigestData("#PIF-d11aff76c5d149948046", "nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
- stageData.HashPreviousStage);
+ stageData.HashPreviousStep);
TestVehicleDataVIF02(stageData.Vehicle);
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index e5b5465e55..8300998e2e 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -580,12 +580,12 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</PrimaryVehicle>
<ManufacturingStep stepCount="2">
<Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf">
- <HashPreviousStage>
+ <HashPreviousStep>
<di:Reference>
<di:DigestMethod Algorithm=""></di:DigestMethod>
<di:DigestValue></di:DigestValue>
</di:Reference>
- </HashPreviousStage>
+ </HashPreviousStep>
<vif0.1:Vehicle xsi:type="v2.8:InterimStageInputType" id="MST-1234" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
--
GitLab