Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace the XPath overrides with a more intuitive syntax, add support for properties #18

Merged
merged 18 commits into from
Nov 12, 2018
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
34d04ac
Replace XPath with a more intuitive overrides configuration
rtzoeller Nov 6, 2018
558c32f
Expose properties through configuration file
rtzoeller Nov 6, 2018
6dc8f90
Use concatenating terminal for properties
rtzoeller Nov 6, 2018
4e588f2
Expose properties to VeriStandTestCase through a lookup method
rtzoeller Nov 6, 2018
ccdcfc2
Add changes from LabVIEW not saving everything until closing
rtzoeller Nov 6, 2018
8731097
Create polymorphic VIs for getting and setting property values
rtzoeller Nov 7, 2018
ab70f12
Check that calls to get and set properties are successful
rtzoeller Nov 7, 2018
c89fa38
Initial submission of benchmark utility. Refactor OpenVeriStandConnec…
csjall Nov 7, 2018
f020e83
Merge branch 'dev/performance' into dev/intuitive_overrides
rtzoeller Nov 7, 2018
51d2902
Use generic .NET error code when getting/setting properties fails
rtzoeller Nov 7, 2018
8f46cda
Report errors for calls which don't set a property
rtzoeller Nov 7, 2018
055a585
Read a property during the open/close test to ensure they are passed …
rtzoeller Nov 7, 2018
58d0c2e
Merge branch 'master' into dev/intuitive_overrides
rtzoeller Nov 8, 2018
e00f35b
Store the properties to the class in PatchSystemDefinitionFile
rtzoeller Nov 8, 2018
87fc93a
Add missing icon
rtzoeller Nov 9, 2018
78b5cf6
Address feedback from Johann
rtzoeller Nov 9, 2018
bac181e
Add configuration file for benchmarking tests to specify the IP address
rtzoeller Nov 9, 2018
6197392
Change default configuration file from overrides.ini to config.ini
rtzoeller Nov 9, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Replace XPath with a more intuitive overrides configuration
The overrides are specified with the syntax demonstrated below.

[Overrides]
"Targets/Controller/IP Address" = "10.2.64.29"
"Aliases/DoNotAllowUnmappedAliases" = "false"
"Targets/Controller/Hardware/Chassis/Timing and Sync/Chassis TimeSync/user.CD.Priority1" = "64"
rtzoeller committed Nov 6, 2018
commit 34d04aca4c15b8fe0a609feec3225200feca18d3
5 changes: 4 additions & 1 deletion VeriStand Test Utilities.lvproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="15008000">
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Property Name="NI.Project.Description" Type="Str"></Property>
@@ -709,6 +709,9 @@
</Item>
<Item Name="OperationErrorType.ctl" Type="VI" URL="/&lt;nishared&gt;/LabVIEW CLI/Operations/Utilities/OperationErrorType.ctl"/>
<Item Name="Verbosity.ctl" Type="VI" URL="/&lt;nishared&gt;/LabVIEW CLI/Operations/Utilities/Verbosity.ctl"/>
<Item Name="NationalInstruments.VeriStand.SystemStorage" Type="Document" URL="NationalInstruments.VeriStand.SystemStorage">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build"/>
</Item>
141 changes: 141 additions & 0 deletions VeriStand Test Utilities.lvproj.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version ="1.0"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!-- ================================= GAC files ==================================== -->
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.APIInterface" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ClientAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.Internal" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemDefinitionAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemStorage" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.SystemStorageUI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.WorkspaceMacro" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.XMLReader" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.DataTypes" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ATMLTestResults" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.RealTimeSequenceDefinitionApi" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.UsiDotNetApi" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.RealTimeSequenceDefinitionApiUtilities" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ASAM.XIL.Implementation.TestBench" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<!-- ================================= Local files ==================================== -->
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.CommonUI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.Compiler" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.MacroPlayerRecorder" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ResXResourceManager" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.ServerAPI" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.UIStyleManager" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NationalInstruments.VeriStand.DataTypes.Utilities.dll" publicKeyToken="a6d690c380daa308" culture="Neutral" />
<!-- Assembly versions can be redirected in application,
publisher policy, or machine configuration files. -->
<bindingRedirect oldVersion="0.0.0.0-2222.0.0.0" newVersion="2015.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Binary file not shown.
Binary file modified VeriStandTestUtilities/GenerateOverriddenSystemDefinition.vi
Binary file not shown.
Binary file not shown.
Binary file modified VeriStandTestUtilities/OverrideItem.ctl
Binary file not shown.
Binary file modified VeriStandTestUtilities/QueryCustomDevices.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/QueryDAQHardware.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/QueryHardware.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/QuerySystemDefinitionFile.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/QueryTarget.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/QueryTimingAndSyncHardware.vi
Binary file not shown.
Binary file modified VeriStandTestUtilities/ReadSystemDefinitionOverrideFile.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 12 additions & 0 deletions VeriStandTestUtilities/VeriStandTestUtilities.lvlib
Original file line number Diff line number Diff line change
@@ -32,6 +32,9 @@
<Item Name="ConnectorPaneTemplate.ctl" Type="VI" URL="../ConnectorPaneTemplate.ctl">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="ConvertSystemDefinitionPropertyTypeToEnum.vi" Type="VI" URL="../ConvertSystemDefinitionPropertyTypeToEnum.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="ExtractVINames.vi" Type="VI" URL="../ExtractVINames.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
@@ -43,6 +46,9 @@
<Item Name="GetExecutionMode.vi" Type="VI" URL="../GetExecutionMode.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="GetSystemDefinitionNodeByName.vi" Type="VI" URL="../GetSystemDefinitionNodeByName.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="GetTargetIPAddresses.vi" Type="VI" URL="../GetTargetIPAddresses.vi"/>
<Item Name="GetValuesMatchingXPath.vi" Type="VI" URL="../GetValuesMatchingXPath.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
@@ -75,6 +81,12 @@
<Item Name="ReadTDMSFileFromDataLogConfiguration.vi" Type="VI" URL="../../VeriStandTestCase/Utilities/ReadTDMSFileFromDataLogConfiguration.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="SetSystemDefinitionPropertyValue.vi" Type="VI" URL="../SetSystemDefinitionPropertyValue.vi">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="SystemDefinitionInformation.ctl" Type="VI" URL="../SystemDefinitionInformation.ctl"/>
<Item Name="SystemDefinitionPropertyType.ctl" Type="VI" URL="../SystemDefinitionPropertyType.ctl">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
</Item>
<Item Name="TargetInformation.ctl" Type="VI" URL="../TargetInformation.ctl"/>
</Library>