Mark tests requiring hardware as system tests (ni#53)

Separate system and unit tests to correctly execute on PharLap
zszilagy · Jan 8, 2020 · 9e8b39e · 9e8b39e
1 parent 5eaa2b9
commit 9e8b39e
Show file tree

Hide file tree

Showing 20 changed files with 201 additions and 114 deletions.
diff --git a/VeriStand Test Utilities.lvproj b/VeriStand Test Utilities.lvproj
@@ -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"/>

diff --git a/...ts/Unit/Assets/BenchmarkConfiguration.ini → .../System/Assets/BenchmarkConfiguration.ini b/...ts/Unit/Assets/BenchmarkConfiguration.ini → .../System/Assets/BenchmarkConfiguration.ini
diff --git a/VeriStandTestCase/Tests/System/Assets/DummyProperty.ini b/VeriStandTestCase/Tests/System/Assets/DummyProperty.ini
@@ -0,0 +1,5 @@
+[Overrides]
+"Targets/Controller/IP Address" = "VS-Eco-Slave-8880"
+
+[Properties]
+"Dummy Property" = "Dummy Value"
diff --git a/...ase/Tests/Unit/Assets/MostlyEmpty.nivssdf → ...e/Tests/System/Assets/MostlyEmpty.nivssdf b/...ase/Tests/Unit/Assets/MostlyEmpty.nivssdf → ...e/Tests/System/Assets/MostlyEmpty.nivssdf
diff --git a/VeriStandTestCase/Tests/System/VeriStandTestCaseSystemTests.lvclass b/VeriStandTestCase/Tests/System/VeriStandTestCaseSystemTests.lvclass
diff --git a/VeriStandTestCase/Tests/System/setUp.vi b/VeriStandTestCase/Tests/System/setUp.vi
diff --git a/VeriStandTestCase/Tests/System/targets.ini b/VeriStandTestCase/Tests/System/targets.ini
@@ -0,0 +1,5 @@
+[Supported Targets]
+PharLap = vs-eco-slave-8880
+
+[Active Configuration]
+Platform = PharLap
diff --git a/VeriStandTestCase/Tests/System/tearDown.vi b/VeriStandTestCase/Tests/System/tearDown.vi
diff --git a/VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionFails.vi b/VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionFails.vi
diff --git a/VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionPasses.vi b/VeriStandTestCase/Tests/System/testBenchmarkSystemDefinitionPasses.vi
diff --git a/VeriStandTestCase/Tests/System/testExample.vit b/VeriStandTestCase/Tests/System/testExample.vit
diff --git a/.../Unit/testOpenCloseVeriStandConnection.vi → ...ystem/testOpenCloseVeriStandConnection.vi b/.../Unit/testOpenCloseVeriStandConnection.vi → ...ystem/testOpenCloseVeriStandConnection.vi
diff --git a/VeriStandTestCase/Tests/Unit/VeriStandTestCaseTests.lvclass b/VeriStandTestCase/Tests/Unit/VeriStandTestCaseTests.lvclass
diff --git a/VeriStandTestCase/Tests/Unit/VeriStandTestCaseUnitTests.lvclass b/VeriStandTestCase/Tests/Unit/VeriStandTestCaseUnitTests.lvclass
diff --git a/VeriStandTestCase/Tests/Unit/setUp.vi b/VeriStandTestCase/Tests/Unit/setUp.vi
diff --git a/VeriStandTestCase/Tests/Unit/tearDown.vi b/VeriStandTestCase/Tests/Unit/tearDown.vi
diff --git a/VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionFails.vi b/VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionFails.vi
diff --git a/VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionPasses.vi b/VeriStandTestCase/Tests/Unit/testBenchmarkSystemDefinitionPasses.vi
diff --git a/VeriStandTestCase/Tests/Unit/testExample.vit b/VeriStandTestCase/Tests/Unit/testExample.vit
diff --git a/VeriStandTestCase/Tests/Unit/testGetPropertyFromAddedConfigurationFileWithoutDeploying.vi b/VeriStandTestCase/Tests/Unit/testGetPropertyFromAddedConfigurationFileWithoutDeploying.vi