Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@francois-normandin
francois-normandin committed Jul 11, 2021
2 parents 53bf647 + 1f8b5aa commit 8166636
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 13 deletions.
33 changes: 20 additions & 13 deletions src/Caraya.vipb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2021-07-02 15:11:51" Creator="Tomi Maila" Comments="" ID="d85321d4baabbf27a1b7926426f49772">
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2021-07-11 12:07:17" Creator="Tomi Maila" Comments="" ID="6b241154290e1f54d3fe3f3011cfd1a1">
<Library_General_Settings>
<Package_File_Name>jki_lib_caraya</Package_File_Name>
<Library_Version>1.2.0.130</Library_Version>
<Library_Version>1.2.1.132</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
Expand Down Expand Up @@ -46,7 +46,10 @@ http://jki.net/tools#caraya</Description>
<Copyright/>
<Packager>JKI</Packager>
<URL>https://github.com/JKISoftware/Caraya</URL>
<Release_Notes>This release includes features to build into PPL, provides Caraya library information and ability to wrap assert methods without redefining the test (as a result, the extension of Caraya Assertion API is now simple and straightforward)
<Release_Notes>This is a patch to resolve a bug in the application context for running Caraya tests through VI Server. Thanks Pascal Neuperger (@logmanoriginal) for the patches.

Cumulative update 1.2.0 and 1.2.1:
This release includes features to build into PPL, provides Caraya library information and ability to wrap assert methods without redefining the test (as a result, the extension of Caraya Assertion API is now simple and straightforward)

New Features:

Expand All @@ -65,6 +68,8 @@ Fixes:
[Fix: 131] Almost equal now reports a verbose UTF-8 compatible string
[Fix: 133] Handling of linker info errors during test discovery step in Test Runners.
[Fix: 135] Caraya library path now resolves for PPLs, EXE and project-specific installs
[Fix: 137] Fixes the context in which TestRunner is executing
[Fix: 138] Fixes the incorrect re-run of last test in Test Manager UI when no tests found

Thanks for all the contributions that led to this release, whether by reporting bugs, requesting features that made it to release or by lending a hand in fixing issues or releasing features:

Expand All @@ -76,8 +81,10 @@ Jim Kring (@jimkring)
Philip Lundeen (@plundeen)
Stephen Loftus-Mercer (@SRM256)
Blake Mitchell (@bmitc)
Pascal Neuperger (@logmanoriginal)
Francois Normandin (@francois-normandin)
Felipe Pinheiro Silva (@felipefoz)

</Release_Notes>
</Description>
<Destinations>
Expand Down Expand Up @@ -391,7 +398,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Assert\Assert.vi</Path>
<VI_Title>Assert</VI_Title>
</Items_Data>
<GUID>6FDFC78D4E77399F459FAE7DD8889A65</GUID>
<GUID>88835D4809382E068844BF8507D84D15</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -496,7 +503,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>Test Results</Path>
<VI_Title/>
</Items_Data>
<GUID>616CC3D30518FF28A2B2AE5D3A68FD16</GUID>
<GUID>A6CC2F49220F957F6500A4AFB05B58DC</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>8</Parent_Palette_Index>
Expand Down Expand Up @@ -587,7 +594,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Test Result\Get Type.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>5C3586AE5AA34E6126875E245F299B90</GUID>
<GUID>C10EA1897B15A36B7DB58E0BE7D2A2B2</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -818,7 +825,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Assert\Assert Not Equal Type_Variant.vi</Path>
<VI_Title>Assert Not Equal Type</VI_Title>
</Items_Data>
<GUID>83CE6FD200D7B1A814F52CD244265924</GUID>
<GUID>72BF0975EFFC3BBDC5F9C4DCB9683F2F</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -881,7 +888,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>subVIs\Run Tests Programmatically.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>61C3083BEA5D78BB3D482C96BC464469</GUID>
<GUID>2FDFEEA44BE379C7131AFDBD5D3F8753</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -1070,7 +1077,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Test Runner.Class\Setup TestRunner ClassInstance.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>9568691324D21F22FAFD4722E8434A4D</GUID>
<GUID>99C1DAB4C732C9CF35FD531391944A75</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>5</Parent_Palette_Index>
Expand Down Expand Up @@ -1301,7 +1308,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Test Runner\Write Linkage Errors.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>7B25E10730BD7710225C830B83309BF1</GUID>
<GUID>9B70F46B3B70F63E712C56E4732FDF16</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -1434,7 +1441,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>Advanced VI Tree - Caraya.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>2A9BADC4B394E2E6B707628ECDF5AE2B</GUID>
<GUID>F3A3C8DC4F76014EC453C14DAB4DB5D2</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -1511,7 +1518,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>Advanced Reporting</Path>
<VI_Title/>
</Items_Data>
<GUID>A8841B9DF5533902EE0018C382DE9DCD</GUID>
<GUID>D8195D8D9273163BC1EE8270FDEE1F0C</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>1</Parent_Palette_Index>
Expand Down Expand Up @@ -1588,7 +1595,7 @@ Felipe Pinheiro Silva (@felipefoz)
<Path>classes\Test Result\Get Node.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>CDB67DA7A5AB84D6869E3EADFBD0DC56</GUID>
<GUID>2A0E0F5D8BC00B4D12FC841BBC69A4CD</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
9 changes: 9 additions & 0 deletions src/classes/Basic Test Manager/Basic Test Manager.lvclass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,15 @@
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1082139136</Property>
</Item>
<Item Name="Rerun Tests.vi" Type="VI" URL="../Rerun Tests.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">%Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%@!!!!#1!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#B!)3*$97RM:71A5H6O)&amp;2F=X2T)'FO)%&amp;D&gt;'FW:3"1=G^K:7.U!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!$J!=!!?!!!J$%.B=G&amp;Z93ZM&gt;GRJ9BJ5:8.U)%6W:7ZU)&amp;.U&lt;X*B:W5O&lt;(:D&lt;'&amp;T=Q!(5X2P=G&amp;H:1"5!0!!$!!$!!1!"1!%!!1!"!!%!!1!"A!%!!1!"Q-!!(A!!!U)!!!!!!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#A!!!!!!!!!!!!!!%A!!!!!"!!A!!!!!</Property>
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">2</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1342710288</Property>
</Item>
</Item>
<Item Name="Process.vi" Type="VI" URL="../Process.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">%Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!).!!!!$A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!%2!=!!?!!!J$%.B=G&amp;Z93ZM&gt;GRJ9BJ#98.J9S"5:8.U)%VB&lt;G&amp;H:8)O&lt;(:D&lt;'&amp;T=Q!16'6T&gt;#".97ZB:W6S)'^V&gt;!!!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!/1$$`````"5RB9G6M!!Z!5QB"=G&gt;V&lt;76O&gt;!!!8Q$R!!!!!!!!!!-45'FO;S"&amp;&lt;'6Q;'&amp;O&gt;#ZM&gt;GRJ9B25:8.U)%VB&lt;G&amp;H:8)O&lt;(:D&lt;'&amp;T=R.5:8.U)%6W:7ZU)%2B&gt;'%O9X2M!"J!5!!#!!=!#!J5:8.U)%6W:7ZU!!!71(!!'1!"!!E+6'6T&gt;#"&amp;&gt;G6O&gt;!!!,%"Q!"=!!!!"!!%!!!0I!!I:28:F&lt;H1A5G6H;8.U=G&amp;U;7^O)&amp;*F:GZV&lt;1"#1(!!(A!!+1R$98*B?7%O&lt;(:M;7);1G&amp;T;7-A6'6T&gt;#".97ZB:W6S,GRW9WRB=X-!$V2F=X1A47&amp;O97&gt;F=C"J&lt;A"B!0!!$!!$!!1!"!!&amp;!!1!"!!%!!1!"A!%!!M!$!-!!(A!!!U)!!!!!!!!!!!!!!U,!!!!!!!!!!!!!!!!!!!!!!!!#A!!!!!!!!!)!!!!%!!!$1!!!!Q!!!!!!!!!!!!!!1!.!!!!!!</Property>
Expand Down
Binary file modified src/classes/Basic Test Manager/Process.vi
View file
Binary file not shown.
Binary file added src/classes/Basic Test Manager/Rerun Tests.vi
View file
Binary file not shown.
Binary file modified src/classes/Test Runner/DestroyTestSuite.vi
View file
Binary file not shown.
Binary file modified src/project/Caraya/Run Tests in Active Project.vi
View file
Binary file not shown.
Binary file modified src/subVIs/Run Tests (Project).vi
View file
Binary file not shown.

0 comments on commit 8166636

Please sign in to comment.