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.

Sign up for GitHub

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

Mark tests requiring hardware as system tests #53

Merged
merged 4 commits into from
Jan 8, 2020
Merged

Mark tests requiring hardware as system tests #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0097743
Separate system and unit tests to correctly execute on PharLap
Jan 3, 2020
fafe1ef
Add missing test dependency to system test assets
Jan 3, 2020
cd78d09
Add property file to project
Jan 3, 2020
d566184
Save class dependencies with updated class name (initially missed)
Jan 3, 2020
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
12 changes: 9 additions & 3 deletions VeriStand Test Utilities.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
<Item Name="Tests" Type="Folder">
<Item Name="Unit" Type="Folder">
<Item Name="Assets" Type="Folder">
<Item Name="BenchmarkConfiguration.ini" Type="Document" URL="../VeriStandTestCase/Tests/Unit/Assets/BenchmarkConfiguration.ini"/>
<Item Name="DummyProperty.ini" Type="Document" URL="../VeriStandTestCase/Tests/Unit/Assets/DummyProperty.ini"/>
<Item Name="MostlyEmpty.nivssdf" Type="Document" URL="../VeriStandTestCase/Tests/Unit/Assets/MostlyEmpty.nivssdf"/>
</Item>
<Item Name="VeriStandTestCaseTests.lvclass" Type="LVClass" URL="../VeriStandTestCase/Tests/Unit/VeriStandTestCaseTests.lvclass"/>
<Item Name="VeriStandTestCaseUnitTests.lvclass" Type="LVClass" URL="../VeriStandTestCase/Tests/Unit/VeriStandTestCaseUnitTests.lvclass"/>
</Item>
<Item Name="System" Type="Folder">
<Item Name="Assets" Type="Folder">
<Item Name="BenchmarkConfiguration.ini" Type="Document" URL="../VeriStandTestCase/Tests/System/Assets/BenchmarkConfiguration.ini"/>
<Item Name="DummyProperty.ini" Type="Document" URL="../VeriStandTestCase/Tests/System/Assets/DummyProperty.ini"/>
<Item Name="MostlyEmpty.nivssdf" Type="Document" URL="../VeriStandTestCase/Tests/System/Assets/MostlyEmpty.nivssdf"/>
</Item>
<Item Name="VeriStandTestCaseSystemTests.lvclass" Type="LVClass" URL="../VeriStandTestCase/Tests/System/VeriStandTestCaseSystemTests.lvclass"/>
</Item>
</Item>
<Item Name="VeriStandTestCase.lvclass" Type="LVClass" URL="../VeriStandTestCase/VeriStandTestCase.lvclass"/>
Expand Down
0 ...ts/Unit/Assets/BenchmarkConfiguration.ini → .../System/Assets/BenchmarkConfiguration.ini
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions VeriStandTestCase/Tests/System/Assets/DummyProperty.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Overrides]
"Targets/Controller/IP Address" = "VS-Eco-Slave-8880"

[Properties]
"Dummy Property" = "Dummy Value"
0 ...ase/Tests/Unit/Assets/MostlyEmpty.nivssdf → ...e/Tests/System/Assets/MostlyEmpty.nivssdf
View file
Open in desktop
File renamed without changes.
102 changes: 102 additions & 0 deletions VeriStandTestCase/Tests/System/VeriStandTestCaseSystemTests.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added VeriStandTestCase/Tests/System/setUp.vi
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions VeriStandTestCase/Tests/System/targets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Supported Targets]
PharLap = vs-eco-slave-8880

[Active Configuration]
Platform = PharLap
Binary file added VeriStandTestCase/Tests/System/tearDown.vi
View file
Open in desktop
Binary file not shown.
Binary file added VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionFails.vi
View file
Open in desktop
Binary file not shown.
Binary file added VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionPasses.vi
View file
Open in desktop
Binary file not shown.
Binary file added VeriStandTestCase/Tests/System/testExample.vit
View file
Open in desktop
Binary file not shown.
Binary file renamed .../Unit/testOpenCloseVeriStandConnection.vi → ...ystem/testOpenCloseVeriStandConnection.vi
View file
Open in desktop
Binary file not shown.
111 changes: 0 additions & 111 deletions VeriStandTestCase/Tests/Unit/VeriStandTestCaseTests.lvclass
View file
Open in desktop

This file was deleted.

80 changes: 80 additions & 0 deletions VeriStandTestCase/Tests/Unit/VeriStandTestCaseUnitTests.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified VeriStandTestCase/Tests/Unit/setUp.vi
View file
Open in desktop
Binary file not shown.
Binary file modified VeriStandTestCase/Tests/Unit/tearDown.vi
View file
Open in desktop
Binary file not shown.
Binary file removed VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionFails.vi
View file
Open in desktop
Binary file not shown.
Binary file removed VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionPasses.vi
View file
Open in desktop
Binary file not shown.
Binary file modified VeriStandTestCase/Tests/Unit/testExample.vit
View file
Open in desktop
Binary file not shown.
Binary file modified VeriStandTestCase/Tests/Unit/testGetPropertyFromAddedConfigurationFileWithoutDeploying.vi
View file
Open in desktop
Binary file not shown.