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

TestMethods.OuterLoop.Start/End UI changes, ver. 2.12.414

Browse Source
This commit is contained in:
Milan Hanajik
2016-12-10 16:27:51 +01:00
parent 8b4890560e
commit c8c411aebc
13 changed files with 52 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/Common.cs
+16 -15
View File
@@ -23,27 +23,28 @@ namespace TBF.BenchControl.Elde
public enum StatusP : ulong public enum StatusP : ulong
{ {
RefFlowMeterMask = 0x7, RefFlowMeterMask = 0x7,
TestCompleted = 0x10, TestCompleted = 0x10, /// bit 4
TestInProgress = 0x20, TestInProgress = 0x20, /// bit 5
//DiverterError = 0x20, //DiverterError = 0x20,
MsrmntWithDivrtr = 0x80, MsrmntWithDivrtr = 0x80, /// bit 7
RefPulsesMsrmnt = 0x100, /// bit 8 RefPulsesMsrmnt = 0x100, /// bit 8
SynchroMethod = 0x800, /// bit 11 SynchroMethod = 0x800, /// bit 11
WaterMeterCalib = 0x1000, /// bit 12 WaterMeterCalib = 0x1000, /// bit 12
EmgcyStopActive = 0x2000, EmgcyStopActive = 0x2000, /// bit 13
MsrmntGateActive = 0x4000, MsrmntGateActive = 0x4000, /// bit 14
TimeMeasurement = 0x8000, TimeMeasurement = 0x8000, /// bit 15
FrequencyMeasured = 0x80000, /// bit 19 FrequencyMeasured = 0x80000, /// bit 19
CoaxRegValveBusy = 0x200000, /// bit 21 CoaxRegValveBusy = 0x200000, /// bit 21
ADCError = 0x80000000, ADCError = 0x80000000, /// bit 31
TimeoutOccured = 0x100000000, TimeoutOccured = 0x100000000, /// bit 32
MeretAddresses = 0x200000000, MeretAddresses = 0x200000000, /// bit 33
SampleBuferFull = 0x400000000, SampleBuferFull = 0x400000000, /// bit 34
ErrorTempMeter = 0x10000000000, ErrorTempMeter = 0x10000000000, /// bit 40
ErrorPressMeter1 = 0x1000000000000, ErrorPressMeter1 = 0x1000000000000, /// bit 48
ErrorPressMeter2 = 0x2000000000000, ErrorPressMeter2 = 0x2000000000000, /// bit 49
ErrorPressMeter3 = 0x4000000000000, ErrorPressMeter3 = 0x4000000000000, /// bit 50
ErrorPressMeter4 = 0x8000000000000, ErrorPressMeter4 = 0x8000000000000, /// bit 51
EndurCycleRunning = 0x200000000000000, /// bit 57
} }
#else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 #else // DN100 || MUNICH || FUZHOU150 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40
public enum StatusP : ulong public enum StatusP : ulong
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+20 -5
View File
@@ -487,7 +487,10 @@ namespace TBF.BenchControl.Sequences
/// Try to fetch all test paths and transitions /// Try to fetch all test paths and transitions
/// to detect configuration errors as early as possible. /// to detect configuration errors as early as possible.
string errorMsg; string errorMsg;
if (!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter), TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) &&
!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) &&
!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
out inPath, out benchPath, out outPath, out sensPath, out inPath, out benchPath, out outPath, out sensPath,
out heatMetersPath, out heatMetersPath,
out transitionBefore, out transitionAfter, out transitionBefore, out transitionAfter,
@@ -508,7 +511,10 @@ namespace TBF.BenchControl.Sequences
/// Fetch the test paths and transitions /// Fetch the test paths and transitions
string errorMsg; string errorMsg;
if (!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter), TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) &&
!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) &&
!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
out inPath, out benchPath, out outPath, out sensPath, out inPath, out benchPath, out outPath, out sensPath,
out heatMetersPath, out heatMetersPath,
out transitionBefore, out transitionAfter, out transitionBefore, out transitionAfter,
@@ -624,7 +630,10 @@ namespace TBF.BenchControl.Sequences
/// Try to fetch all test paths and transitions /// Try to fetch all test paths and transitions
/// to detect configuration errors as early as possible. /// to detect configuration errors as early as possible.
string errorMsg; string errorMsg;
if (!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter), TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) &&
!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) &&
!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
out inPath, out benchPath, out outPath, out sensPath, out inPath, out benchPath, out outPath, out sensPath,
out heatMetersPath, out heatMetersPath,
out transitionBefore, out transitionAfter, out transitionBefore, out transitionAfter,
@@ -645,7 +654,10 @@ namespace TBF.BenchControl.Sequences
/// Fetch the test paths and transitions /// Fetch the test paths and transitions
string errorMsg; string errorMsg;
if (!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter), TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) &&
!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) &&
!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
out inPath, out benchPath, out outPath, out sensPath, out inPath, out benchPath, out outPath, out sensPath,
out heatMetersPath, out heatMetersPath,
out transitionBefore, out transitionAfter, out transitionBefore, out transitionAfter,
@@ -739,7 +751,10 @@ namespace TBF.BenchControl.Sequences
/// Fetch the test paths and transitions /// Fetch the test paths and transitions
string errorMsg; string errorMsg;
if (!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter), TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) &&
!(testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) &&
!StateMachine.GetPaths(test, (StateMachine.Procedure.MetersKind == MetersKind.HeatMeter),
out inPath, out benchPath, out outPath, out sensPath, out inPath, out benchPath, out outPath, out sensPath,
out heatMetersPath, out heatMetersPath,
out transitionBefore, out transitionAfter, out transitionBefore, out transitionAfter,
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Component.cs
+1 -4
View File
@@ -16,8 +16,6 @@ namespace TBF.BenchControl.TestMethods.OuterLoop.End
return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1)); return string.Format("{0}({1})", this.GetType().Namespace.Substring(17), Cfg.ToString(1));
} }
readonly TestMethodCfg testMethodCfg;
public bool Evaluate(Test test) { return true; } public bool Evaluate(Test test) { return true; }
public bool Publish(Test test) { return true; } public bool Publish(Test test) { return true; }
public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; } public bool CanTest(MetersKind meters) { return meters == MetersKind.Single; }
@@ -29,7 +27,6 @@ namespace TBF.BenchControl.TestMethods.OuterLoop.End
public Component(Generic.IComponentCfg cfg) public Component(Generic.IComponentCfg cfg)
: base(cfg) : base(cfg)
{ {
testMethodCfg = cfg as TestMethodCfg;
log.Debug(this.ToString()); log.Debug(this.ToString());
} }
@@ -41,7 +38,7 @@ namespace TBF.BenchControl.TestMethods.OuterLoop.End
{ {
events.Add(Event.Error); /// Outer loops mode expected events.Add(Event.Error); /// Outer loops mode expected
} }
else if (outerLoopCounter < testMethodCfg.TestParams.Repeats) else if (outerLoopCounter < test.Repeats)
{ {
events.Add(Event.OuterLoopNext); events.Add(Event.OuterLoopNext);
} }
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/Factory.cs
+1
View File
@@ -3,6 +3,7 @@
/// ///
using System.Collections.Generic; using System.Collections.Generic;
using TBF.BenchControl.Generic; using TBF.BenchControl.Generic;
using TBF.BenchControl.Configs.NameOnly;
namespace TBF.BenchControl.TestMethods.OuterLoop.End namespace TBF.BenchControl.TestMethods.OuterLoop.End
{ {
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/TestMethodCfg.cs
-47
View File
@@ -1,47 +0,0 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.TestMethods.OuterLoop.End
{
public class TestMethodCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
/// <summary> Test parameters </summary>
[XmlIgnore]
public TestParams TestParams;
public override IParamsProvider GetTestParams() { return TestParams; }
public override IParamsProvider CreateTestParams(Test test)
{
TestParams testParams = new TestParams();
testParams.UpdateTestParams(Name, test);
return testParams;
}
/// Private parameterless constructor invoked by all other (public) constructors
TestMethodCfg()
{
TestParams = new TestParams();
}
public TestMethodCfg(string name, IComponentFactory factory)
: this()
{
Name = name;
ParentName = string.Empty;
Factory = factory;
}
public string ToString(int i)
{
return string.Format("Name={0}", Name);
}
}
}
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/TestMethodCfgCtrl.cs
-71
View File
@@ -1,71 +0,0 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.Windows.Forms;
using log4net;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.TestMethods.OuterLoop.End
{
public partial class TestMethodCfgCtrl : UserControl, IComponentCfgCtrl
{
static readonly ILog log = LogManager.GetLogger(typeof(TestMethodCfgCtrl));
public bool ShowMore { get { return false; } }
TestMethodCfg config;
public IComponentCfg Config
{
get { return config as IComponentCfg; }
set
{
config = value as TestMethodCfg;
Redraw();
}
}
public TestMethodCfgCtrl()
{
InitializeComponent();
}
private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
{
Redraw();
}
public void Closing()
{
}
void Redraw()
{
if (config == null) return; /// Control was not loaded, settings were not changed
classNameLabel.Text = config.Factory.ClassName;
nameTextBox.Text = config.Name;
}
public void Unlock()
{
nameTextBox.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message)
{
CfgUpdateFlags flags = CfgUpdateFlags.None;
return flags;
}
public CfgUpdateFlags UpdateCfg()
{
CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
config.Name = nameTextBox.Text;
return flags;
}
}
}
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/TestMethodCfgCtrl.designer.cs
Generated
-86
View File
@@ -1,86 +0,0 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
namespace TBF.BenchControl.TestMethods.OuterLoop.End
{
partial class TestMethodCfgCtrl
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.nameTextBox = new System.Windows.Forms.TextBox();
this.nameLabel = new System.Windows.Forms.Label();
this.classNameLabel = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// nameTextBox
//
this.nameTextBox.Enabled = false;
this.nameTextBox.Location = new System.Drawing.Point(137, 57);
this.nameTextBox.Name = "nameTextBox";
this.nameTextBox.Size = new System.Drawing.Size(130, 20);
this.nameTextBox.TabIndex = 5;
//
// nameLabel
//
this.nameLabel.AutoSize = true;
this.nameLabel.Location = new System.Drawing.Point(27, 60);
this.nameLabel.Name = "nameLabel";
this.nameLabel.Size = new System.Drawing.Size(35, 13);
this.nameLabel.TabIndex = 4;
this.nameLabel.Text = "Name";
//
// classNameLabel
//
this.classNameLabel.AutoSize = true;
this.classNameLabel.Location = new System.Drawing.Point(134, 33);
this.classNameLabel.Name = "classNameLabel";
this.classNameLabel.Size = new System.Drawing.Size(83, 13);
this.classNameLabel.TabIndex = 3;
this.classNameLabel.Text = "ComonentName";
//
// BasicPrinterCfgCtrl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.nameTextBox);
this.Controls.Add(this.nameLabel);
this.Controls.Add(this.classNameLabel);
this.Name = "BasicPrinterCfgCtrl";
this.Size = new System.Drawing.Size(300, 200);
this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TextBox nameTextBox;
private System.Windows.Forms.Label nameLabel;
private System.Windows.Forms.Label classNameLabel;
}
}
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/TestMethodCfgCtrl.resx
-120
View File
@@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
TestBenchFramework/BenchControl/TestMethods/OuterLoop/End/TestParams.cs
-112
View File
@@ -1,112 +0,0 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
namespace TBF.BenchControl.TestMethods.OuterLoop.End
{
public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{
public int Repeats; /// Number of outer loop repeats
public override void InitializeAll()
{
Repeats = 10;
}
string[] paramNames = new string[]
{
Strings.Repeats_nr_chdr,
};
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }
public override string ToString(int i)
{
switch (i)
{
case 0: return Repeats.ToString();
default: return string.Empty;
}
}
public void UpdateParam(int i, string strValue)
{
switch (i)
{
case 0: Repeats = int.Parse(strValue); return;
default: return;
}
}
public bool ValidateParam(int i, string strValue, out string message)
{
message = string.Empty;
int iDummy;
switch (i)
{
case 0:
if (int.TryParse(strValue, out iDummy)) return true;
break;
default:
message = "Invalid index";
return false;
}
message = ParamName(i) + " is invalid";
return false;
}
void CopyContentTo(TestParams prms)
{
prms.Repeats = this.Repeats;
}
public IParamsProvider Clone()
{
TestParams pars = new TestParams();
CopyContentTo(pars);
return pars;
}
public override void UpdateTestParams(ComponentTest dbEntity)
{
if (dbEntity == null) return;
try
{
TestParams tmp = (TestParams)(new XmlSerializer(typeof(TestParams)))
.Deserialize(new StringReader(dbEntity.Parameters));
testParamsEntity = dbEntity;
componentName = dbEntity.CmpntName;
test = dbEntity.Test;
tmp.CopyContentTo(this);
}
catch
{
}
}
/// <summary>
/// Parameterless constructor initializes the parameters
/// </summary>
public TestParams()
{
}
public TestParams(ComponentTest testParamsEntity, string componentName, Test test)
{
this.testParamsEntity = testParamsEntity;
this.componentName = componentName;
this.test = test;
}
}
}
TestBenchFramework/ProcedureDlg.cs
+7
View File
@@ -1664,6 +1664,13 @@ namespace TBF
ITestMethod selectedMethod = TestMethods.FirstOrDefault<ITestMethod>(x => x.Name.Equals(test.Method)); ITestMethod selectedMethod = TestMethods.FirstOrDefault<ITestMethod>(x => x.Name.Equals(test.Method));
if (selectedMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component
|| selectedMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component)
{
test.Publish = (sbyte)Publish.Never;
test.Evaluate = false;
goto done;
}
if (selectedMethod is BenchControl.TestMethods.PMaxTest.TestMethod) goto pressure_label; if (selectedMethod is BenchControl.TestMethods.PMaxTest.TestMethod) goto pressure_label;
if (selectedMethod is BenchControl.TestMethods.LeakTest.TestMethod) goto pressure_label; if (selectedMethod is BenchControl.TestMethods.LeakTest.TestMethod) goto pressure_label;
#if HEAT_METERS_SUPPORT #if HEAT_METERS_SUPPORT
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.12.413.1")] [assembly: AssemblyVersion("2.12.414.1")]
[assembly: AssemblyFileVersion("2.12.413.1")] [assembly: AssemblyFileVersion("2.12.414.1")]
TestBenchFramework/TBF.csproj
-11
View File
@@ -676,14 +676,6 @@
<Compile Include="BenchControl\TestMethods\iPerlCommunication\TestMethodFactory.cs" /> <Compile Include="BenchControl\TestMethods\iPerlCommunication\TestMethodFactory.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\End\Component.cs" /> <Compile Include="BenchControl\TestMethods\OuterLoop\End\Component.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\End\Factory.cs" /> <Compile Include="BenchControl\TestMethods\OuterLoop\End\Factory.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\End\TestParams.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\End\TestMethodCfg.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\End\TestMethodCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\TestMethods\OuterLoop\End\TestMethodCfgCtrl.designer.cs">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\TestMethods\OuterLoop\Start\Component.cs" /> <Compile Include="BenchControl\TestMethods\OuterLoop\Start\Component.cs" />
<Compile Include="BenchControl\TestMethods\OuterLoop\Start\Factory.cs" /> <Compile Include="BenchControl\TestMethods\OuterLoop\Start\Factory.cs" />
<Compile Include="BenchControl\WaterMeters\iPerl\CalibrationStruct.cs" /> <Compile Include="BenchControl\WaterMeters\iPerl\CalibrationStruct.cs" />
@@ -1874,9 +1866,6 @@
<EmbeddedResource Include="BenchControl\TestMethods\LeakTest\TestMethodCfgCtrl.resx"> <EmbeddedResource Include="BenchControl\TestMethods\LeakTest\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon> <DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="BenchControl\TestMethods\OuterLoop\End\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\TestMethods\PMaxTest\TestMethodCfgCtrl.resx"> <EmbeddedResource Include="BenchControl\TestMethods\PMaxTest\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon> <DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
TestBenchFramework/TestProgressControls.cs
+5
View File
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using TBF.UiBridge; using TBF.UiBridge;
using TBF.BenchControl;
namespace TBF namespace TBF
{ {
@@ -74,6 +75,10 @@ namespace TBF
progresses = new List<UiControls.TestProgressCtrl>(); progresses = new List<UiControls.TestProgressCtrl>();
foreach (var test in args.Procedure.Tests) foreach (var test in args.Procedure.Tests)
{ {
TBF.BenchControl.Generic.IComponent testMethod = TbfComponents.FindComponent(test.Method);
if (testMethod is TBF.BenchControl.TestMethods.OuterLoop.Start.Component) continue;
if (testMethod is TBF.BenchControl.TestMethods.OuterLoop.End.Component) continue;
for (int i = 1; i <= test.Repeats; i++) for (int i = 1; i <= test.Repeats; i++)
{ {
UiControls.TestProgressCtrl prgrs = UiControls.TestProgressCtrl prgrs =