Merge branch 'feature/lvlib-runner' into develop

vipm-io · May 22, 2020 · 1e02877 · 1e02877
2 parents 4a67dd4 + c2d63d9
commit 1e02877
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ write unit test cases first.
 
 You can download and install Caraya with VI Package Manager.
 
-[Get Caraya](https://resources.jki.net/caraya)
+[![image](https://user-images.githubusercontent.com/381432/82577953-93511c00-9b40-11ea-95ca-d338e3954394.png)](https://www.vipm.io/package/jki_lib_caraya)
 
 ## Usage
 Caraya is a LabVIEW toolkit providing a library of assertion VIs to validate run-time constraints of any LabVIEW
@@ -159,3 +159,8 @@ Caraya is an open source project maintained by [JKI](http://jki.net).
 
 Caraya is distributed under the open source three clause BSD license providing everyone right to use and distribute both souce code
 and compiled versions of Caraya. See LICENSE.md file for details.
+
+## Get Caraya
+Ready to get started? You can install Caraya with VIPM here:
+
+[![image](https://user-images.githubusercontent.com/381432/82577953-93511c00-9b40-11ea-95ca-d338e3954394.png)](https://www.vipm.io/package/jki_lib_caraya)
diff --git a/src/Advanced VI Tree - Caraya.vi b/src/Advanced VI Tree - Caraya.vi
diff --git a/src/Caraya.lvlib b/src/Caraya.lvlib
@@ -53,6 +53,7 @@
 		<Item Name="Test Runner.Class.lvclass" Type="LVClass" URL="../classes/Test Runner.Class/Test Runner.Class.lvclass"/>
 		<Item Name="Test Runner.Collection.lvclass" Type="LVClass" URL="../classes/Test Runner.Collection/Test Runner.Collection.lvclass"/>
 		<Item Name="Test Runner.Template.lvclass" Type="LVClass" URL="../classes/Test Runner.Template/Test Runner.Template.lvclass"/>
+		<Item Name="Test Runner.Library.lvclass" Type="LVClass" URL="../classes/Test Runner.Library/Test Runner.Library.lvclass"/>
 	</Item>
 	<Item Name="Assertions" Type="Folder">
 		<Item Name="Assert.lvclass" Type="LVClass" URL="../classes/Assert/Assert.lvclass"/>
@@ -64,6 +65,7 @@
 		<Item Name="Run Test (Scalar Path).vi" Type="VI" URL="../run-tests/Run Test (Scalar Path).vi"/>
 		<Item Name="Run Test (Array Path).vi" Type="VI" URL="../run-tests/Run Test (Array Path).vi"/>
 		<Item Name="Run Test (ProjectRefnum).vi" Type="VI" URL="../run-tests/Run Test (ProjectRefnum).vi"/>
+		<Item Name="Run Test (LibraryRefnum).vi" Type="VI" URL="../run-tests/Run Test (LibraryRefnum).vi"/>
 		<Item Name="Run Test (Object).vi" Type="VI" URL="../run-tests/Run Test (Object).vi"/>
 		<Item Name="Run Test (Object Array).vi" Type="VI" URL="../run-tests/Run Test (Object Array).vi"/>
 		<Item Name="Run Test (VIRefnum Scalar).vi" Type="VI" URL="../run-tests/Run Test (VIRefnum Scalar).vi"/>

diff --git a/src/Caraya.lvproj b/src/Caraya.lvproj
@@ -115,6 +115,7 @@
 				<Item Name="test_pathArray.vi" Type="VI" URL="../tests/test-polymorphic run/test_pathArray.vi"/>
 				<Item Name="test_pathProject.vi" Type="VI" URL="../tests/test-polymorphic run/test_pathProject.vi"/>
 				<Item Name="test_refnumProject.vi" Type="VI" URL="../tests/test-polymorphic run/test_refnumProject.vi"/>
+				<Item Name="test_refnumLibrary.vi" Type="VI" URL="../tests/test-polymorphic run/test_refnumLibrary.vi"/>
 				<Item Name="test_VIRefnumScalar.vi" Type="VI" URL="../tests/test-polymorphic run/test_VIRefnumScalar.vi"/>
 				<Item Name="test_VIRefnumArray.vi" Type="VI" URL="../tests/test-polymorphic run/test_VIRefnumArray.vi"/>
 				<Item Name="test_pathClassScalar.vi" Type="VI" URL="../tests/test-polymorphic run/test_pathClassScalar.vi"/>

diff --git a/src/VI Tree - Caraya.vi b/src/VI Tree - Caraya.vi
diff --git a/src/classes/Test Runner.Library/Setup TestRunner Library.vi b/src/classes/Test Runner.Library/Setup TestRunner Library.vi
diff --git a/src/classes/Test Runner.Library/Test Runner.Library.lvclass b/src/classes/Test Runner.Library/Test Runner.Library.lvclass
diff --git a/src/classes/Test Runner.Library/onTestDiscovery.vi b/src/classes/Test Runner.Library/onTestDiscovery.vi
diff --git a/src/classes/Test Runner.Library/onTestExecution.vi b/src/classes/Test Runner.Library/onTestExecution.vi
diff --git a/src/errors/Caraya-errors.txt b/src/errors/Caraya-errors.txt
@@ -3,6 +3,7 @@
 <nicomment>
 Caraya Error Codes are referenced in the project's wiki page on GitHub:
 https://github.com/JKISoftware/Caraya/wiki/Caraya-Error-Codes
+
 <nifamily familyname="Caraya" displayname="Caraya Unit Test Framework">
 </nifamily>
 </nicomment>
@@ -48,6 +49,9 @@ Caraya Test Runner: Unsupported file type
 <nierror code="7107">
 Caraya Test Runner: Undefined object
 </nierror>
+<nierror code="7108">
+Caraya Test Runner: Library reference is invalid
+</nierror>
 <nierror code="7200">
 Caraya Batch Tester: Generic Test Manager error (ex: Unhandled state)
 </nierror>

diff --git a/src/run-tests/Run Test (LibraryRefnum).vi b/src/run-tests/Run Test (LibraryRefnum).vi
diff --git a/src/run-tests/Run Test (Scalar Path).vi b/src/run-tests/Run Test (Scalar Path).vi
diff --git a/src/run-tests/Run Tests.vi b/src/run-tests/Run Tests.vi
diff --git a/src/tests/library-under-test/Dummy VI without tests.vi b/src/tests/library-under-test/Dummy VI without tests.vi
diff --git a/src/tests/library-under-test/Test VI 01.vi b/src/tests/library-under-test/Test VI 01.vi
diff --git a/src/tests/library-under-test/Test VI 02.vi b/src/tests/library-under-test/Test VI 02.vi
diff --git a/src/tests/library-under-test/library-under-test.lvlib b/src/tests/library-under-test/library-under-test.lvlib
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Library LVVersion="13008000">
+	<Property Name="NI.Lib.Icon" Type="Bin">%Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;7R=2MR%!81N=?"5X&lt;A91P&lt;!FNA#^M#5Y6M96NA"R[WM#WQ"&lt;9A0ZYR'E?G!WPM1$AN&gt;@S(!ZZQG&amp;0%VLZ'@)H8:_X\&lt;^P(^7@8H\4Y;"`NX\;8JZPUX@@MJXC]C.3I6K5S(F/^DHTE)R`ZS%@?]J;XP/5N&lt;XH*3V\SEJ?]Z#F0?=J4HP+5&lt;Y=]Z#%0/&gt;+9@%QU"BU$D-YI-4[':XC':XB]D?%:HO%:HO(2*9:H?):H?)&lt;(&lt;4%]QT-]QT-]BNIEMRVSHO%R@$20]T20]T30+;.Z'K".VA:OAW"%O^B/GK&gt;ZGM&gt;J.%`T.%`T.)`,U4T.UTT.UTROW6;F.]XDE0-9*IKH?)KH?)L(U&amp;%]R6-]R6-]JIPC+:[#+"/7Q2'CX&amp;1[F#`&amp;5TR_2@%54`%54`'YN$WBWF&lt;GI8E==J\E3:\E3:\E-51E4`)E4`)EDW%D?:)H?:)H?5Q6S:-]S:-A;6,42RIMX:A[J3"Z`'S\*&lt;?HV*MENS.C&lt;&gt;Z9GT,7:IOVC7*NDFA00&gt;&lt;$D0719CV_L%7.N6CR&amp;C(7(R=,(1M4;Z*9.T][RNXH46X62:X632X61?X6\H(L8_ZYP^`D&gt;LP&amp;^8K.S_53Z`-Z4K&gt;4()`(/"Q/M&gt;`P9\@&lt;P&lt;U'PDH?8AA`XUMPTP_EXOF`[8`Q&lt;IT0]?OYVOA(5/(_Z!!!!!!</Property>
+	<Property Name="NI.Lib.SourceVersion" Type="Int">318799872</Property>
+	<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
+	<Item Name="folder" Type="Folder">
+		<Item Name="Test VI 02.vi" Type="VI" URL="../Test VI 02.vi"/>
+	</Item>
+	<Item Name="Dummy VI without tests.vi" Type="VI" URL="../Dummy VI without tests.vi"/>
+	<Item Name="Test VI 01.vi" Type="VI" URL="../Test VI 01.vi"/>
+</Library>
diff --git a/src/tests/test-polymorphic run/test_refnumLibrary.vi b/src/tests/test-polymorphic run/test_refnumLibrary.vi
diff --git a/src/tests/test-runner/Runner Tests.vi b/src/tests/test-runner/Runner Tests.vi