michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XmlSerializers created by XmlSerializer.FromType(new[] {typeof(...)})[0]; This prevents throwing an exception => better debugging.

Browse Source
This commit is contained in:
Milan Hanajik
2017-06-22 21:37:05 +02:00
parent 7ad8c986d7
commit 17f6f7c3be
193 changed files with 450 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/Factory.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(TestMethodCfg), component, this);
return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
}
}
}
TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs
+3
View File
@@ -12,6 +12,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
{
public class TestMethodCfg : ComponentCfgBase, Generic.IComponentCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
/// <summary> Test parameters </summary>
TestBenchFramework/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs
+6 -4
View File
@@ -13,7 +13,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
{
public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{
public bool SupressTrills; /// Main meter readings are ignored during test (suitable for small flows)
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestParams) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public bool SupressTrills; /// Main meter readings are ignored during test (suitable for small flows)
public override void InitializeAll()
{
@@ -81,14 +84,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
if (dbEntity == null) return;
try
{
TestParams tmp = (TestParams)(new XmlSerializer(typeof(TestParams)))
.Deserialize(new StringReader(dbEntity.Parameters));
TestParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as TestParams;
testParamsEntity = dbEntity;
componentName = dbEntity.CmpntName;
test = dbEntity.Test;
tmp.CopyContentTo(this);
if (tmp != null) tmp.CopyContentTo(this);
}
catch
{
TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/Factory.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(TestMethodCfg), component, this);
return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
}
}
}
TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs
+3
View File
@@ -12,6 +12,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{
public class TestMethodCfg : ComponentCfgBase, Generic.IComponentCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
/// <summary> Test parameters </summary>
TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs
+5 -3
View File
@@ -13,6 +13,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{
public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestParams) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }
public float ErrorLimitLo; /// [%]
public float ErrorLimitHi; /// [%]
public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy
@@ -159,14 +162,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
if (dbEntity == null) return;
try
{
TestParams tmp = (TestParams)(new XmlSerializer(typeof(TestParams)))
.Deserialize(new StringReader(dbEntity.Parameters));
TestParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as TestParams;
testParamsEntity = dbEntity;
componentName = dbEntity.CmpntName;
test = dbEntity.Test;
tmp.CopyContentTo(this);
if (tmp != null) tmp.CopyContentTo(this);
}
catch
{
TestBenchFramework/BenchControl/TestMethods/FlyingStart/Single/Factory.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Single
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
return ComponentCfgBase.CreateFromDbEntity(typeof(TestMethodCfg), component, this);
return ComponentCfgBase.CreateFromDbEntity(TestMethodCfg.Serializer, component, this);
}
}
}