Merge pull request #483 in VECTO/vecto-sim from...

Merge pull request #483 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-546-gearboxcertificationoptiontype to develop

* commit '694e496e':
  adding missing certification options
  reproduce bug in testcase

VectoCommon/VectoCommon/Models/CertificationMethod.cs

@@ -29,31 +29,40 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
-using System;
-
-namespace TUGraz.VectoCommon.Models
-{
-	public enum CertificationMethod
-	{
-		StandardValues,
-		Measured,
-		NotCertified
-	}
-
-	public static class CertificationMethodHelper
-	{
-		public static string ToXMLFormat(this CertificationMethod method)
-		{
-			switch (method) {
-				case CertificationMethod.StandardValues:
-					return "Standard values";
-				case CertificationMethod.Measured:
-					return "Measured";
-				case CertificationMethod.NotCertified:
-					return "NOT CERTIFIED";
-				default:
-					throw new ArgumentOutOfRangeException("CertificationMethod", method, null);
-			}
-		}
-	}
+using System;
+
+namespace TUGraz.VectoCommon.Models
+{
+	public enum CertificationMethod
+	{
+		StandardValues,
+		Measured,
+		Option1,
+		Option2,
+		Option3,
+		NotCertified
+	}
+
+	public static class CertificationMethodHelper
+	{
+		public static string ToXMLFormat(this CertificationMethod method)
+		{
+			switch (method) {
+				case CertificationMethod.StandardValues:
+					return "Standard values";
+				case CertificationMethod.Measured:
+					return "Measured";
+				case CertificationMethod.Option1:
+					return "Option 1";
+				case CertificationMethod.Option2:
+					return "Option 2";
+				case CertificationMethod.Option3:
+					return "Option 3";
+				case CertificationMethod.NotCertified:
+					return "NOT CERTIFIED";
+				default:
+					throw new ArgumentOutOfRangeException("CertificationMethod", method, null);
+			}
+		}
+	}
 }
\ No newline at end of file

VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs

@@ -60,6 +60,9 @@ namespace TUGraz.VectoCore.Tests.XML
 		const string SampleVehicleDecl = "TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample.xml";
 		const string SampleVehicleFullDecl = "TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_FULL.xml";
 
+		const string SampleVehicleFullDeclCertificationOptions =
+			"TestData/XML/XMLReaderDeclaration/vecto_vehicle-sample_certificationOptions.xml";
+
 		[TestMethod]
 		public void TestXMLInputEng()
 		{
@@ -802,5 +805,18 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual("only the drive shaft of the PTO - multi-disc clutch", ptoDataProvider.PTOTransmissionType);
 			Assert.AreEqual(1000, lookup.PowerDemand.Value());
 		}
+
+		[TestMethod]
+		public void TestCertificationMethodInput()
+		{
+			var reader = XmlReader.Create(SampleVehicleFullDeclCertificationOptions);
+
+			var inputDataProvider = new XMLDeclarationInputDataProvider(reader, true);
+
+			Assert.AreEqual(CertificationMethod.Option2, inputDataProvider.GearboxInputData.CertificationMethod);
+			Assert.AreEqual(CertificationMethod.Measured, inputDataProvider.AxleGearInputData.CertificationMethod);
+			Assert.AreEqual(CertificationMethod.Measured, inputDataProvider.RetarderInputData.CertificationMethod);
+			Assert.AreEqual(CertificationMethod.Measured, inputDataProvider.AirdragInputData.CertificationMethod);
+		}
 	}
 }
\ No newline at end of file