From 7b902e8ca382032ab594a0f53e69db841d1713ca Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 29 Jun 2015 11:14:33 +0200 Subject: [PATCH] IComponentFactory.DummyComponent() interface function added and implemented in all components. --- .../BenchControl/Ambient/Comet/Ambient.cs | 4 ++++ .../BenchControl/Ambient/Comet/Factory.cs | 2 ++ .../BenchControl/Ambient/Greco/Ambient.cs | 4 ++++ .../BenchControl/Ambient/Greco/Factory.cs | 2 ++ TestBenchFramework/BenchControl/BenchId/Component.cs | 4 ++++ .../BenchControl/BenchId/ComponentFactory.cs | 2 ++ .../BenchControl/Cameras/CameraRoi/CameraRoi.cs | 4 ++++ .../Cameras/CameraRoi/CameraRoiFactory.cs | 2 ++ .../BenchControl/Cameras/IdcCamera/IdcCamera.cs | 4 ++++ .../Cameras/IdcCamera/IdcCameraFactory.cs | 2 ++ TestBenchFramework/BenchControl/ComponentBase.cs | 11 ++++++++++- .../BenchControl/Danfoss/VLT2800/Pump.cs | 4 ++++ .../BenchControl/Danfoss/VLT2800/PumpFactory.cs | 2 ++ .../BenchControl/DataEntry/Combined/EntryForm.cs | 6 +++++- .../DataEntry/Combined/EntryFormFactory.cs | 2 ++ .../BenchControl/DataEntry/Munich/EntryForm.cs | 6 +++++- .../DataEntry/Munich/EntryFormFactory.cs | 2 ++ .../BenchControl/DataEntry/Munich3/EntryForm.cs | 4 ++++ .../DataEntry/Munich3/EntryFormFactory.cs | 2 ++ .../BenchControl/DataEntry/Standard/EntryForm.cs | 4 ++++ .../DataEntry/Standard/EntryFormFactory.cs | 2 ++ .../BenchControl/DataEntry/Standard24/EntryForm.cs | 4 ++++ .../DataEntry/Standard24/EntryFormFactory.cs | 2 ++ .../BenchControl/DataEntry/WMStates/EntryForm.cs | 4 ++++ .../DataEntry/WMStates/EntryFormFactory.cs | 2 ++ .../BenchControl/Elde/ControlBoardDev.cs | 6 +++++- .../BenchControl/Elde/ControlBoardFactory.cs | 12 ++++-------- .../BenchControl/Elde/Diverter/Diverter.cs | 4 ++++ .../BenchControl/Elde/Diverter/DiverterFactory.cs | 2 ++ .../Elde/FixedStartRegisterReader/RegisterReader.cs | 4 ++++ .../RegisterReaderFactory.cs | 2 ++ .../BenchControl/Elde/FlowMeter/FlowMeter.cs | 4 ++++ .../BenchControl/Elde/FlowMeter/FlowMeterFactory.cs | 2 ++ .../BenchControl/Elde/FlowMeterTwins/FlowMeter.cs | 6 +++++- .../Elde/FlowMeterTwins/FlowMeterFactory.cs | 2 ++ .../BenchControl/Elde/PressureMeter/PressureMeter.cs | 4 ++++ .../Elde/PressureMeter/PressureMeterFactory.cs | 2 ++ .../Elde/PressureMeterInternal/PressureMeter.cs | 4 ++++ .../PressureMeterInternal/PressureMeterFactory.cs | 2 ++ TestBenchFramework/BenchControl/Elde/Pump/Pump.cs | 4 ++++ .../BenchControl/Elde/Pump/PumpFactory.cs | 2 ++ .../BenchControl/Elde/PumpTandem/Pump.cs | 4 ++++ .../BenchControl/Elde/PumpTandem/PumpFactory.cs | 2 ++ .../BenchControl/Elde/PumpWithFM/Pump.cs | 5 +++++ .../BenchControl/Elde/PumpWithFM/PumpFactory.cs | 2 ++ .../Elde/RegisterReader/RegisterReader.cs | 4 ++++ .../Elde/RegisterReader/RegisterReaderFactory.cs | 2 ++ .../BenchControl/Elde/RegulValve/RegulValve.cs | 4 ++++ .../Elde/RegulValve/RegulValveFactory.cs | 2 ++ .../Elde/RegulValveTandem/RegulValveTandem.cs | 4 ++++ .../Elde/RegulValveTandem/RegulValveTandemFactory.cs | 2 ++ .../BenchControl/Elde/TempMeter/TempMeter.cs | 4 ++++ .../BenchControl/Elde/TempMeter/TempMeterFactory.cs | 2 ++ .../BenchControl/Elde/TempMeterInternal/TempMeter.cs | 4 ++++ .../Elde/TempMeterInternal/TempMeterFactory.cs | 2 ++ TestBenchFramework/BenchControl/Elde/Valve/Valve.cs | 4 ++++ .../BenchControl/Elde/Valve/ValveFactory.cs | 4 +++- .../BenchControl/Generic/IComponentFactory.cs | 6 ++++++ .../BenchControl/GenericDevices/ValveBase.cs | 4 ++++ .../BenchControl/MettlerToledo/Multi/BalanceDev.cs | 10 +++++++--- .../MettlerToledo/Multi/BalanceFactory.cs | 12 ++++-------- .../MettlerToledo/Standard/BalanceDev.cs | 10 +++++++--- .../MettlerToledo/Standard/BalanceFactory.cs | 12 ++++-------- .../MettlerToledo/Standard/BalanceNewDev.cs | 4 ++++ .../MettlerToledo/Standard/BalanceNewFactory.cs | 12 ++++-------- .../BenchControl/ResultsPrinters/Basic/Printer.cs | 4 ++++ .../ResultsPrinters/Basic/PrinterFactory.cs | 2 ++ .../BenchControl/ResultsPrinters/Munich/Printer.cs | 4 ++++ .../ResultsPrinters/Munich/PrinterFactory.cs | 2 ++ .../BenchControl/ResultsWriters/Basic/Writer.cs | 4 ++++ .../ResultsWriters/Basic/WriterFactory.cs | 2 ++ .../TestMethods/Adjustment/TestMethod.cs | 4 ++++ .../TestMethods/Adjustment/TestMethodFactory.cs | 2 ++ .../TestMethods/CameraRoiDetection/RoiDetection.cs | 4 ++++ .../CameraRoiDetection/RoiDetectionFactory.cs | 2 ++ .../TestMethods/CombinedMeters/TestMethod.cs | 4 ++++ .../TestMethods/CombinedMeters/TestMethodFactory.cs | 2 ++ .../TestMethods/CombinedWithDetection/TestMethod.cs | 4 ++++ .../CombinedWithDetection/TestMethodFactory.cs | 2 ++ .../FixedStartCombinedMeters/TestMethod.cs | 4 ++++ .../FixedStartCombinedMeters/TestMethodFactory.cs | 2 ++ .../FixedStartMassCollection/TestMethod.cs | 4 ++++ .../FixedStartMassCollection/TestMethodFactory.cs | 2 ++ .../TestMethods/FlyingStart/TestMethod.cs | 4 ++++ .../TestMethods/FlyingStart/TestMethodFactory.cs | 2 ++ .../FlyingStartCollectionMethod/TestMethod.cs | 4 ++++ .../FlyingStartCollectionMethod/TestMethodFactory.cs | 2 ++ .../BenchControl/TestMethods/LeakTest/TestMethod.cs | 4 ++++ .../TestMethods/LeakTest/TestMethodFactory.cs | 2 ++ .../BenchControl/TestMethods/PMaxTest/TestMethod.cs | 4 ++++ .../TestMethods/PMaxTest/TestMethodFactory.cs | 2 ++ .../ReferenceFlowmeterCalibration/TestMethod.cs | 4 ++++ .../TestMethodFactory.cs | 2 ++ .../BenchControl/WaterMeter/WaterMeter.cs | 4 ++++ .../BenchControl/WaterMeter/WaterMeterFactory.cs | 2 ++ 95 files changed, 316 insertions(+), 44 deletions(-) diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs b/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs index 3bffbdf37..ff8b95632 100644 --- a/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs +++ b/TestBenchFramework/BenchControl/Ambient/Comet/Ambient.cs @@ -41,6 +41,10 @@ namespace TBF.BenchControl.Ambient.Comet /// Measurement time stamp when MsrmntState == MsrmntState.Valid int msrmntTimeStamp; + public Ambient() + { + } + /// /// Ambient temperature / humidity / pressure meter 'Greco' connected via serial interface (RS232) /// Connection settings: 19200 Bd 8-bits No-parity 1-stop-bit Flow control: none or hardware. diff --git a/TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs b/TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs index b1ba1935d..cd9d34084 100644 --- a/TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs +++ b/TestBenchFramework/BenchControl/Ambient/Comet/Factory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Ambient.Comet public void ResetStaticProperties() { Ambient.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Ambient(); } + public IComponentCfg DefaultConfig() { return new AmbientCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs b/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs index 858c4f1f7..2d6dfbe3a 100644 --- a/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs +++ b/TestBenchFramework/BenchControl/Ambient/Greco/Ambient.cs @@ -42,6 +42,10 @@ namespace TBF.BenchControl.Ambient.Greco /// Measurement time stamp when MsrmntState == MsrmntState.Valid int msrmntTimeStamp; + public Ambient() + { + } + /// /// Ambient temperature / humidity / pressure meter 'Greco' connected via serial interface (RS232) /// Connection settings: 19200 Bd 8-bits No-parity 1-stop-bit Flow control: none or hardware. diff --git a/TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs b/TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs index 6839cbb79..29159866d 100644 --- a/TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs +++ b/TestBenchFramework/BenchControl/Ambient/Greco/Factory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Ambient.Greco public void ResetStaticProperties() { Ambient.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Ambient(); } + public IComponentCfg DefaultConfig() { return new AmbientCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/BenchId/Component.cs b/TestBenchFramework/BenchControl/BenchId/Component.cs index 2c5493819..94f14038f 100644 --- a/TestBenchFramework/BenchControl/BenchId/Component.cs +++ b/TestBenchFramework/BenchControl/BenchId/Component.cs @@ -23,6 +23,10 @@ namespace TBF.BenchControl.BenchId public int TestBenchNr { get { return benchIdCfg.TestBenchNr; } } + public Component() + { + } + public Component(ComponentCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/BenchId/ComponentFactory.cs b/TestBenchFramework/BenchControl/BenchId/ComponentFactory.cs index 8e9f30f14..0b0c974eb 100644 --- a/TestBenchFramework/BenchControl/BenchId/ComponentFactory.cs +++ b/TestBenchFramework/BenchControl/BenchId/ComponentFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.BenchId public void ResetStaticProperties() { Component.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Component(); } + public IComponentCfg DefaultConfig() { return new ComponentCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoi.cs b/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoi.cs index f76e31b31..ee4ef6de0 100644 --- a/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoi.cs +++ b/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoi.cs @@ -28,6 +28,10 @@ namespace TBF.BenchControl.Cameras.CameraRoi public float PulsesPerLtr { get { return cameraRoiCfg.ProcParams.GradPerLtr; } } + public CameraRoi() + { + } + public CameraRoi(CameraRoiCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiFactory.cs b/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiFactory.cs index 7da2a474e..624095a7c 100644 --- a/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiFactory.cs +++ b/TestBenchFramework/BenchControl/Cameras/CameraRoi/CameraRoiFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Cameras.CameraRoi public void ResetStaticProperties() { CameraRoi.ResetStaticProperties(); } + public IComponent DummyComponent() { return new CameraRoi(); } + public IComponentCfg DefaultConfig() { return new CameraRoiCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCamera.cs b/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCamera.cs index a00835ae9..f6e6aaaf7 100644 --- a/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCamera.cs +++ b/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCamera.cs @@ -61,6 +61,10 @@ namespace TBF.BenchControl.Cameras.IdcCamera IWorkerCmd detectCmd; IWorkerCmd measureCmd; + public IdcCamera() + { + } + public IdcCamera(IdcCameraCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCameraFactory.cs b/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCameraFactory.cs index e68c6b6fa..df728806c 100644 --- a/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCameraFactory.cs +++ b/TestBenchFramework/BenchControl/Cameras/IdcCamera/IdcCameraFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Cameras.IdcCamera public void ResetStaticProperties() { IdcCamera.ResetStaticProperties(); } + public IComponent DummyComponent() { return new IdcCamera(); } + public IComponentCfg DefaultConfig() { return new IdcCameraCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/ComponentBase.cs b/TestBenchFramework/BenchControl/ComponentBase.cs index 1fc85bc0b..770a11564 100644 --- a/TestBenchFramework/BenchControl/ComponentBase.cs +++ b/TestBenchFramework/BenchControl/ComponentBase.cs @@ -22,7 +22,16 @@ namespace TBF.BenchControl public Entities.LogLevel LogLevel { get { return cfg.LogLevel; } } public IList Corrections { get { return cfg.Corrections; } } - /// Constructor + + /// Constructor, components created in this way is used by + /// IComponentFactory.DummyComponent() function. Such dummy component should be used + /// only for runtime class type identification (e.g. object is iValve) + public ComponentBase() + { + cfg = null; + } + + /// Constructor with configuration as an argument public ComponentBase(IComponentCfg cfg) { if (cfg == null) throw new ArgumentNullException("cfg"); diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs b/TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs index 6dc6ad9b4..b175dbf04 100644 --- a/TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs +++ b/TestBenchFramework/BenchControl/Danfoss/VLT2800/Pump.cs @@ -107,6 +107,10 @@ namespace TBF.BenchControl.Danfoss.VLT2800 StringBuilder responseBuilder; + public Pump() + { + } + /// /// Ambient temperature / humidity / pressure meter 'Greco' connected via serial interface (RS232) /// Connection settings: 19200 Bd 8-bits No-parity 1-stop-bit Flow control: none or hardware. diff --git a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs b/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs index 7b83fe431..a24863972 100644 --- a/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs +++ b/TestBenchFramework/BenchControl/Danfoss/VLT2800/PumpFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Danfoss.VLT2800 public void ResetStaticProperties() { Pump.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Pump(); } + public IComponentCfg DefaultConfig() { return new PumpCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs index d12870ae5..44670dee7 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs @@ -62,7 +62,11 @@ namespace TBF.BenchControl.DataEntry.Combined CurrentOp currentOp; - public EntryForm(EntryFormCfg cfg) + public EntryForm() + { + } + + public EntryForm(EntryFormCfg cfg) : base(cfg) { serialNr = new string[Program.WMsCount / 2 * 2]; diff --git a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs index 2d0f1f677..983f40f2e 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.Combined public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs index d9fa8d67f..c728886b2 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs @@ -56,7 +56,11 @@ namespace TBF.BenchControl.DataEntry.Munich CurrentOp currentOp; - public EntryForm(EntryFormCfg cfg) + public EntryForm() + { + } + + public EntryForm(EntryFormCfg cfg) : base(cfg) { serialNr = new string[Program.WMsCount]; diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs index 08917a8f2..ce80d3350 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.Munich public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs index 42af18b17..9363cefa0 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs @@ -56,6 +56,10 @@ namespace TBF.BenchControl.DataEntry.Munich3 CurrentOp currentOp; + public EntryForm() + { + } + public EntryForm(EntryFormCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs index 4e3567e09..ce9d3b8f6 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.Munich3 public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs index 4bec8edd3..b83030441 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs @@ -62,6 +62,10 @@ namespace TBF.BenchControl.DataEntry.Standard CurrentOp currentOp; + public EntryForm() + { + } + public EntryForm(EntryFormCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs index 69d39ac9d..9cc7504cc 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.Standard public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs index af806e729..1f26d4589 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs @@ -62,6 +62,10 @@ namespace TBF.BenchControl.DataEntry.Standard24 CurrentOp currentOp; + public EntryForm() + { + } + public EntryForm(EntryFormCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs index a867d1aa3..6aed2e172 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.Standard24 public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs index a3c3dd47c..e5db53776 100644 --- a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs @@ -67,6 +67,10 @@ namespace TBF.BenchControl.DataEntry.WMStates CurrentOp currentOp; + public EntryForm() + { + } + public EntryForm(EntryFormCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs b/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs index 4fc387bb0..9b08903e0 100644 --- a/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs +++ b/TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.DataEntry.WMStates public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); } + public IComponent DummyComponent() { return new EntryForm(); } + public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 42280f1fa..310205255 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -181,7 +181,11 @@ namespace TBF.BenchControl.Elde } - /// + public ControlBoardDev() + { + } + + /// /// Constructor /// public ControlBoardDev(ControlBoardCfg cfg) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs index fb5b2180f..26384ee58 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardFactory.cs @@ -14,15 +14,11 @@ namespace TBF.BenchControl.Elde /// Max. number of components of this class in the system public int MaxCount { get { return 1; } } - public IComponentCfg DefaultConfig() - { - return new ControlBoardCfg(this); - } + public IComponent DummyComponent() { return new ControlBoardDev(); } - public IComponentCfgCtrl CreateCfgCtrl() - { - return new ControlBoardCfgCtrl(); - } + public IComponentCfg DefaultConfig() { return new ControlBoardCfg(this); } + + public IComponentCfgCtrl CreateCfgCtrl() { return new ControlBoardCfgCtrl(); } public IComponent ComponentFromCmpntCfg(IComponentCfg config, IList components) { diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs index b5e19f375..ffcd0b2c7 100644 --- a/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs +++ b/TestBenchFramework/BenchControl/Elde/Diverter/Diverter.cs @@ -21,6 +21,10 @@ namespace TBF.BenchControl.Elde.Diverter get { return (controlBoard.Route & mask) != 0; } } + public Diverter() + { + } + public Diverter(DiverterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs index c962d1e10..cd1fc716e 100644 --- a/TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/Diverter/DiverterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.Diverter public void ResetStaticProperties() { Diverter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Diverter(); } + public IComponentCfg DefaultConfig() { return new DiverterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs b/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs index c903a7ebc..201c8e2ac 100644 --- a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs +++ b/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs @@ -22,6 +22,10 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader public readonly ControlBoardDev ControlBoard; + public RegisterReader() + { + } + public RegisterReader(RegisterReaderCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs b/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs index 63d987d7d..827b1da45 100644 --- a/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader public void ResetStaticProperties() { RegisterReader.ResetStaticProperties(); } + public IComponent DummyComponent() { return new RegisterReader(); } + public IComponentCfg DefaultConfig() { return new RegisterReaderCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs index 85c44796e..3d778ae8e 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeter.cs @@ -31,6 +31,10 @@ namespace TBF.BenchControl.Elde.FlowMeter } + public FlowMeter() + { + } + public FlowMeter(FlowMeterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs index f98c7294d..c3643068b 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.FlowMeter public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new FlowMeter(); } + public IComponentCfg DefaultConfig() { return new FlowMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs index c50c8822c..d881809d8 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs @@ -34,7 +34,11 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins } - public FlowMeter(FlowMeterCfg cfg, IList components) + public FlowMeter() + { + } + + public FlowMeter(FlowMeterCfg cfg, IList components) : base(cfg) { flowMeterCfg = cfg; diff --git a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs index 53ab12da5..f0a17591c 100644 --- a/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/FlowMeterTwins/FlowMeterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins public void ResetStaticProperties() { FlowMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new FlowMeter(); } + public IComponentCfg DefaultConfig() { return new FlowMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs index 75c471f84..81cf6cf70 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeter.cs @@ -21,6 +21,10 @@ namespace TBF.BenchControl.Elde.PressureMeter public readonly int Idx0; /// 0..3 public readonly byte RS485Address; /// 0..255 + public PressureMeter() + { + } + public PressureMeter(PressureMeterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs index 1fa75e436..548b18042 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeter/PressureMeterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.PressureMeter public void ResetStaticProperties() { PressureMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new PressureMeter(); } + public IComponentCfg DefaultConfig() { return new PressureMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs index 5cd95eed6..38850054e 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeter.cs @@ -21,6 +21,10 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal public int Idx0 { get { return pressureMeterCfg.Idx0; } } /// 0..7 + public PressureMeter() + { + } + public PressureMeter(PressureMeterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs index c9fa03f99..3e0a2dda2 100644 --- a/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/PressureMeterInternal/PressureMeterFactory.cs @@ -12,6 +12,8 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal public void ResetStaticProperties() { PressureMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new PressureMeter(); } + public IComponentCfg DefaultConfig() { return new PressureMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs b/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs index 269a0dc11..6652c5202 100644 --- a/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs +++ b/TestBenchFramework/BenchControl/Elde/Pump/Pump.cs @@ -32,6 +32,10 @@ namespace TBF.BenchControl.Elde.Pump public readonly ulong Mask; /// derived from bitPosition in the constructor + public Pump() + { + } + public Pump(PumpCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs b/TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs index ab7b83a1f..328149cfb 100644 --- a/TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/Pump/PumpFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.Pump public void ResetStaticProperties() { Pump.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Pump(); } + public IComponentCfg DefaultConfig() { return new PumpCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs b/TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs index 5c22a6752..29ee1e4cf 100644 --- a/TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs +++ b/TestBenchFramework/BenchControl/Elde/PumpTandem/Pump.cs @@ -42,6 +42,10 @@ namespace TBF.BenchControl.Elde.PumpTandem public ulong Mask { get { return mask1 | mask2; } } /// derived from masks of two pumps + public Pump() + { + } + public Pump(PumpCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs b/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs index c5c3f37b1..c70790c2b 100644 --- a/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/PumpTandem/PumpFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.PumpTandem public void ResetStaticProperties() { Pump.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Pump(); } + public IComponentCfg DefaultConfig() { return new PumpCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs b/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs index a58c423b1..903d42af6 100644 --- a/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs +++ b/TestBenchFramework/BenchControl/Elde/PumpWithFM/Pump.cs @@ -41,6 +41,11 @@ namespace TBF.BenchControl.Elde.PumpWithFM get { return power; } } + + public Pump() + { + } + /// /// Constructor /// diff --git a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs b/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs index e1811f3c6..53e9e23cb 100644 --- a/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/PumpWithFM/PumpFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.PumpWithFM public void ResetStaticProperties() { Pump.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Pump(); } + public IComponentCfg DefaultConfig() { return new PumpCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs b/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs index 0f3b43030..81d1d34ce 100644 --- a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs +++ b/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReader.cs @@ -21,6 +21,10 @@ namespace TBF.BenchControl.Elde.RegisterReader public readonly ControlBoardDev ControlBoard; + public RegisterReader() + { + } + public RegisterReader(RegisterReaderCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderFactory.cs b/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderFactory.cs index 68fcf9ebb..873b55159 100644 --- a/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/RegisterReader/RegisterReaderFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.RegisterReader public void ResetStaticProperties() { RegisterReader.ResetStaticProperties(); } + public IComponent DummyComponent() { return new RegisterReader(); } + public IComponentCfg DefaultConfig() { return new RegisterReaderCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs index a4d31e272..2257ad2f8 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs @@ -80,6 +80,10 @@ namespace TBF.BenchControl.Elde.RegulValve #endregion Configuration Change Handling + public RegulValve() + { + } + public RegulValve(RegulValveCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs index 513ad8f3d..913977ae8 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValveFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.RegulValve public void ResetStaticProperties() { RegulValve.ResetStaticProperties(); } + public IComponent DummyComponent() { return new RegulValve(); } + public IComponentCfg DefaultConfig() { return new RegulValveCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs index 0cabc0dd5..7ddba7c6a 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs @@ -35,6 +35,10 @@ namespace TBF.BenchControl.Elde.RegulValveTandem } + public RegulValveTandem() + { + } + public RegulValveTandem(RegulValveTandemCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs index 13b9a17b1..a9eb06893 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValveTandem/RegulValveTandemFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.RegulValveTandem public void ResetStaticProperties() { RegulValveTandem.ResetStaticProperties(); } + public IComponent DummyComponent() { return new RegulValveTandem(); } + public IComponentCfg DefaultConfig() { return new RegulValveTandemCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs b/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs index 1505e4482..236e362f2 100644 --- a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeter.cs @@ -25,6 +25,10 @@ namespace TBF.BenchControl.Elde.TempMeter public float A4 { get { return tempMtrCfg.A4; } } public float A5 { get { return tempMtrCfg.A5; } } + public TempMeter() + { + } + public TempMeter(TempMeterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs index 921a34da2..d8a9cbf3e 100644 --- a/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/TempMeter/TempMeterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.Elde.TempMeter public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TempMeter(); } + public IComponentCfg DefaultConfig() { return new TempMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs b/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs index 97b351a84..df49a89fc 100644 --- a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs +++ b/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeter.cs @@ -21,6 +21,10 @@ namespace TBF.BenchControl.Elde.TempMeterInternal public int Idx0 { get { return tempMtrCfg.Idx0; } } /// 0..7 + public TempMeter() + { + } + public TempMeter(TempMeterCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs b/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs index 45dd7eb26..a2854def4 100644 --- a/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/TempMeterInternal/TempMeterFactory.cs @@ -12,6 +12,8 @@ namespace TBF.BenchControl.Elde.TempMeterInternal public void ResetStaticProperties() { TempMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TempMeter(); } + public IComponentCfg DefaultConfig() { return new TempMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs b/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs index 2a241017b..e7e331712 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/Valve.cs @@ -31,6 +31,10 @@ namespace TBF.BenchControl.Elde.Valve public readonly ulong Mask; /// derived from bitPosition in the constructor + public Valve() + { + } + public Valve(ValveCfg cfg, IList components) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs b/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs index cbf0813c8..f7371ffdd 100644 --- a/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs +++ b/TestBenchFramework/BenchControl/Elde/Valve/ValveFactory.cs @@ -7,10 +7,12 @@ namespace TBF.BenchControl.Elde.Valve { public class ValveFactory : IComponentFactory { - public string ClassName { get { return "Valve"; } } + public string ClassName { get { return "ValveEx"; } } public void ResetStaticProperties() { Valve.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Valve(); } + public IComponentCfg DefaultConfig() { return new ValveCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/Generic/IComponentFactory.cs b/TestBenchFramework/BenchControl/Generic/IComponentFactory.cs index cae05cd37..ce579f3fa 100644 --- a/TestBenchFramework/BenchControl/Generic/IComponentFactory.cs +++ b/TestBenchFramework/BenchControl/Generic/IComponentFactory.cs @@ -9,6 +9,12 @@ namespace TBF.BenchControl.Generic { string ClassName { get; } /// Name of the class of components (for instance "Valve") + /// + /// Returns a dummy component without configuration useful only for runtime class type identification + /// Usage: if (TbfComponents.CmpntFactoryFromClassName(className).DummyComponent() is IValve) { ... } + /// + IComponent DummyComponent(); + /// /// Returns the default configuration /// diff --git a/TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs b/TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs index b91084386..d1758ff2a 100644 --- a/TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs +++ b/TestBenchFramework/BenchControl/GenericDevices/ValveBase.cs @@ -8,6 +8,10 @@ namespace TBF.BenchControl.GenericDevices { public class ValveBase : ComponentBase { + public ValveBase() + { + } + /// /// Invokes ComponentBase constructor /// diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs index 3815e87de..6facd985d 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceDev.cs @@ -65,9 +65,13 @@ namespace TBF.BenchControl.MettlerToledo.Multi public string Format { get { return balanceCfg.Format; } } - /// - /// Constructor - /// + public BalanceDev() + { + } + + /// + /// Constructor + /// /// Balance properties public BalanceDev(BalanceCfg cfg) : base(cfg) diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs index d6e71f465..37edb8693 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceFactory.cs @@ -14,15 +14,11 @@ namespace TBF.BenchControl.MettlerToledo.Multi /// Max. number of components of this class in the system public int MaxCount { get { return 5; } } - public IComponentCfg DefaultConfig() - { - return new BalanceCfg(this); - } + public IComponent DummyComponent() { return new BalanceDev(); } - public IComponentCfgCtrl CreateCfgCtrl() - { - return new BalanceCfgCtrl(); - } + public IComponentCfg DefaultConfig() { return new BalanceCfg(this); } + + public IComponentCfgCtrl CreateCfgCtrl() { return new BalanceCfgCtrl(); } public IComponent ComponentFromCmpntCfg(IComponentCfg config, IList components) { diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs index e02923a3f..b98528d81 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs @@ -65,9 +65,13 @@ namespace TBF.BenchControl.MettlerToledo.Standard public string Format { get { return balanceCfg.Format; } } - /// - /// Constructor - /// + public BalanceDev() + { + } + + /// + /// Constructor + /// /// Balance properties /// A list of components loaded so far public BalanceDev(BalanceCfg cfg) diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs index f193058f6..5ed05fa9d 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs @@ -14,15 +14,11 @@ namespace TBF.BenchControl.MettlerToledo.Standard /// Max. number of components of this class in the system public int MaxCount { get { return 5; } } - public IComponentCfg DefaultConfig() - { - return new BalanceCfg(this); - } + public IComponent DummyComponent() { return new BalanceDev(); } - public IComponentCfgCtrl CreateCfgCtrl() - { - return new BalanceCfgCtrl(); - } + public IComponentCfg DefaultConfig() { return new BalanceCfg(this); } + + public IComponentCfgCtrl CreateCfgCtrl() { return new BalanceCfgCtrl(); } public IComponent ComponentFromCmpntCfg(IComponentCfg config, IList components) { diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs index f748cb9be..4dacf357a 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs @@ -31,6 +31,10 @@ namespace TBF.BenchControl.MettlerToledo.Standard public string SerialNumber { get { return serialNumber; } } string serialNumber; + public BalanceNewDev() + { + } + public BalanceNewDev(BalanceCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs index 1b2d35d3d..e0790b5d2 100644 --- a/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs +++ b/TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs @@ -14,15 +14,11 @@ namespace TBF.BenchControl.MettlerToledo.Standard /// Max. number of components of this class in the system public int MaxCount { get { return 5; } } - public IComponentCfg DefaultConfig() - { - return new BalanceCfg(this); - } + public IComponent DummyComponent() { return new BalanceNewDev(); } - public IComponentCfgCtrl CreateCfgCtrl() - { - return new BalanceCfgCtrl(); - } + public IComponentCfg DefaultConfig() { return new BalanceCfg(this); } + + public IComponentCfgCtrl CreateCfgCtrl() { return new BalanceCfgCtrl(); } public IComponent ComponentFromCmpntCfg(IComponentCfg config, IList components) { diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs index bc7d70305..764463400 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/Printer.cs @@ -26,6 +26,10 @@ namespace TBF.BenchControl.ResultsPrinters.Basic Entities.Procedure procedure; IList unsortedResults; + public Printer() + { + } + public Printer(PrinterCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/PrinterFactory.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/PrinterFactory.cs index f6b3538ba..e8f3fd35f 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/PrinterFactory.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/PrinterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.ResultsPrinters.Basic public void ResetStaticProperties() { Printer.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Printer(); } + public IComponentCfg DefaultConfig() { return new PrinterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs index 6b05742a5..53194fe2a 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/Printer.cs @@ -32,6 +32,10 @@ namespace TBF.BenchControl.ResultsPrinters.Munich public bool SupressPrinting { get { return false; } } + public Printer() + { + } + public Printer(PrinterCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs index 2f7f50e81..6c2238dde 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Munich/PrinterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.ResultsPrinters.Munich public void ResetStaticProperties() { Printer.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Printer(); } + public IComponentCfg DefaultConfig() { return new PrinterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs index 45d2e465a..739a22a82 100644 --- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs +++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs @@ -33,6 +33,10 @@ namespace TBF.BenchControl.ResultsWriters.Basic string separatorStr; + public Writer() + { + } + public Writer(WriterCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/ResultsWriters/Basic/WriterFactory.cs b/TestBenchFramework/BenchControl/ResultsWriters/Basic/WriterFactory.cs index 6d639f86f..af10720b9 100644 --- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/WriterFactory.cs +++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/WriterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.ResultsWriters.Basic public void ResetStaticProperties() { Writer.ResetStaticProperties(); } + public IComponent DummyComponent() { return new Writer(); } + public IComponentCfg DefaultConfig() { return new WriterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs index c6348225d..c7040d8f9 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.Adjustment public bool Publish { get { return false; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethodFactory.cs index 2833d1136..ae2314699 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs index 491dcf436..3a16bb887 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetection.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection public bool Publish { get { return false; } } public bool CanTest(Entities.MetersKind meters) { return true; } + public RoiDetection() + { + } + public RoiDetection(RoiDetectionCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionFactory.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionFactory.cs index b5df5ca2a..9db0dee08 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection public void ResetStaticProperties() { RoiDetection.ResetStaticProperties(); } + public IComponent DummyComponent() { return new RoiDetection(); } + public IComponentCfg DefaultConfig() { return new RoiDetectionCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs index a097f0fb7..242f11839 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethod.cs @@ -19,6 +19,10 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Combined; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethodFactory.cs index ca54f6448..483f278fc 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs index 57e311d61..2f3f57939 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs @@ -19,6 +19,10 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Combined; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs index d21da279c..660bc7a39 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs index 39d40ecf7..bb7023fbf 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethodFactory.cs index 7c06949dc..b7f6ba39e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartCombinedMeters/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs index adf0677c4..41463e87a 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethodFactory.cs index 40c97af41..ccd7713a3 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs index d080f89ce..6cb8dd3fa 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethodFactory.cs index e5c2bc47a..907aff317 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs index a7933765c..dd300da3c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodFactory.cs index 010ef4bcb..ddc9502b1 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs index d3d413c80..c790602c4 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethod.cs @@ -19,6 +19,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return true; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs index 344c80803..6b2d99be8 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs index 7829b38e3..fe3397156 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethod.cs @@ -19,6 +19,10 @@ namespace TBF.BenchControl.TestMethods.PMaxTest public bool Publish { get { return true; } } public bool CanTest(Entities.MetersKind meters) { return true; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs index 9c0d06358..a614b0396 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs index 2e87ad17c..c96518fea 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethod.cs @@ -17,6 +17,10 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration public bool Publish { get { return false; } } public bool CanTest(Entities.MetersKind meters) { return true; } + public TestMethod() + { + } + public TestMethod(TestMethodCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs index d6b69206e..18a32a8e0 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/TestMethodFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration public void ResetStaticProperties() { TestMethod.ResetStaticProperties(); } + public IComponent DummyComponent() { return new TestMethod(); } + public IComponentCfg DefaultConfig() { return new TestMethodCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component) diff --git a/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs b/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs index ee440f631..5e1ad2c41 100644 --- a/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs +++ b/TestBenchFramework/BenchControl/WaterMeter/WaterMeter.cs @@ -59,6 +59,10 @@ namespace TBF.BenchControl.WaterMeter } bool disabled; + public WaterMeter() + { + } + public WaterMeter(WaterMeterCfg cfg) : base(cfg) { diff --git a/TestBenchFramework/BenchControl/WaterMeter/WaterMeterFactory.cs b/TestBenchFramework/BenchControl/WaterMeter/WaterMeterFactory.cs index 17b997dc7..1a5e157d8 100644 --- a/TestBenchFramework/BenchControl/WaterMeter/WaterMeterFactory.cs +++ b/TestBenchFramework/BenchControl/WaterMeter/WaterMeterFactory.cs @@ -11,6 +11,8 @@ namespace TBF.BenchControl.WaterMeter public void ResetStaticProperties() { WaterMeter.ResetStaticProperties(); } + public IComponent DummyComponent() { return new WaterMeter(); } + public IComponentCfg DefaultConfig() { return new WaterMeterCfg(this); } public IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component component)