From 683bacca64dc3ac081f3e01a853248a5f2eeb8c8 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 9 Aug 2019 08:09:02 +0200
Subject: [PATCH] removing testcase no longer relevant, re-activating ng-ci
fuel in testcase
---
.../Resources/XSD/VectoEngineeringJob.xsd | 2 +-
.../XML/XMLDeclarationInputTest.cs | 38 +------------------
2 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
index 6151df8b8c..25ccc0b831 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoEngineeringJob.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:ns2="urn:tugraz:ivt:VectoAPI:EngineeringInput:v1.0" xmlns:ns3="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:EngineeringInput" elementFormDefault="qualified" attributeFormDefault="unqualified" >
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:tugraz:ivt:VectoAPI:EngineeringInput:v0.7" xmlns:ns2="urn:tugraz:ivt:VectoAPI:EngineeringInput:v1.0" xmlns:ns3="urn:tugraz:ivt:VectoAPI:EngineeringDefinitions" xmlns:ns4="urn:tugraz:ivt:VectoAPI:EngineeringInput" targetNamespace="urn:tugraz:ivt:VectoAPI:EngineeringInput" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!--
This is a convienience file that imports the schema for engineering input (i.e., job data) and all supported declaration definitions
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index ef6c2524d1..8f0c2c4e33 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -127,10 +127,6 @@ namespace TUGraz.VectoCore.Tests.XML
continue;
}
- if (fuel.Equals("NG CI")) {
- // not supported at the moment - can't be certified for engines
- continue;
- }
var reader = XmlReader.Create(SampleVehicleDecl);
var doc = new XmlDocument();
@@ -158,39 +154,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
}
- [TestCase("NG CI", TankSystem.Liquefied),
- TestCase("NG CI", TankSystem.Compressed),]
- public void TestUnsupportedEngineFuelTypes(string fuel, TankSystem? tankSystem)
- {
-
- var reader = XmlReader.Create(SampleVehicleDecl);
-
- var doc = new XmlDocument();
- doc.Load(reader);
- var nav = doc.CreateNavigator();
- var manager = new XmlNamespaceManager(nav.NameTable);
- var helper = new XPathHelper(ExecutionMode.Declaration);
- helper.AddNamespaces(manager);
-
- var engineFuelType = nav.SelectSingleNode(helper.QueryAbs(
- helper.NSPrefix(XMLNames.VectoInputDeclaration,
- Constants.XML.RootNSPrefix),
- XMLNames.Component_Vehicle,
- XMLNames.Vehicle_Components,
- XMLNames.Component_Engine, XMLNames.ComponentDataWrapper, XMLNames.Engine_FuelType),
- manager);
- engineFuelType.SetValue(fuel);
- var modified = XmlReader.Create(new StringReader(nav.OuterXml));
-
- var inputDataProvider = xmlInputReader.CreateDeclaration(modified);
- var fuelTyle = inputDataProvider.JobInputData.Vehicle.Components.EngineInputData.EngineModes.First().Fuels.First().FuelType;
- Assert.AreEqual(fuel, fuelTyle.ToXMLFormat());
- AssertHelper.Exception<VectoException>(
- () => {
- DeclarationData.FuelData.Lookup(fuelTyle, tankSystem);
- });
- }
-
+
[TestCase]
public void TestXMLInputGbx()
{
--
GitLab