Skip to content

Commit 8166636

Browse files
Merge branch 'release/1.2.1'
2 parents 53bf647 + 1f8b5aa commit 8166636

File tree

7 files changed

+29
-13
lines changed

7 files changed

+29
-13
lines changed

src/Caraya.vipb

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<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">
1+
<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">
22
<Library_General_Settings>
33
<Package_File_Name>jki_lib_caraya</Package_File_Name>
4-
<Library_Version>1.2.0.130</Library_Version>
4+
<Library_Version>1.2.1.132</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..</Library_Output_Folder>
@@ -46,7 +46,10 @@ http://jki.net/tools#caraya</Description>
4646
<Copyright/>
4747
<Packager>JKI</Packager>
4848
<URL>https://github.com/JKISoftware/Caraya</URL>
49-
<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)
49+
<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.
50+
51+
Cumulative update 1.2.0 and 1.2.1:
52+
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)
5053

5154
New Features:
5255

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

6974
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:
7075

@@ -76,8 +81,10 @@ Jim Kring (@jimkring)
7681
Philip Lundeen (@plundeen)
7782
Stephen Loftus-Mercer (@SRM256)
7883
Blake Mitchell (@bmitc)
84+
Pascal Neuperger (@logmanoriginal)
7985
Francois Normandin (@francois-normandin)
8086
Felipe Pinheiro Silva (@felipefoz)
87+
8188
</Release_Notes>
8289
</Description>
8390
<Destinations>
@@ -391,7 +398,7 @@ Felipe Pinheiro Silva (@felipefoz)
391398
<Path>classes\Assert\Assert.vi</Path>
392399
<VI_Title>Assert</VI_Title>
393400
</Items_Data>
394-
<GUID>6FDFC78D4E77399F459FAE7DD8889A65</GUID>
401+
<GUID>88835D4809382E068844BF8507D84D15</GUID>
395402
</Functions_Palette_Data>
396403
<Functions_Palette_Data>
397404
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -496,7 +503,7 @@ Felipe Pinheiro Silva (@felipefoz)
496503
<Path>Test Results</Path>
497504
<VI_Title/>
498505
</Items_Data>
499-
<GUID>616CC3D30518FF28A2B2AE5D3A68FD16</GUID>
506+
<GUID>A6CC2F49220F957F6500A4AFB05B58DC</GUID>
500507
</Functions_Palette_Data>
501508
<Functions_Palette_Data>
502509
<Parent_Palette_Index>8</Parent_Palette_Index>
@@ -587,7 +594,7 @@ Felipe Pinheiro Silva (@felipefoz)
587594
<Path>classes\Test Result\Get Type.vi</Path>
588595
<VI_Title/>
589596
</Items_Data>
590-
<GUID>5C3586AE5AA34E6126875E245F299B90</GUID>
597+
<GUID>C10EA1897B15A36B7DB58E0BE7D2A2B2</GUID>
591598
</Functions_Palette_Data>
592599
<Functions_Palette_Data>
593600
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -818,7 +825,7 @@ Felipe Pinheiro Silva (@felipefoz)
818825
<Path>classes\Assert\Assert Not Equal Type_Variant.vi</Path>
819826
<VI_Title>Assert Not Equal Type</VI_Title>
820827
</Items_Data>
821-
<GUID>83CE6FD200D7B1A814F52CD244265924</GUID>
828+
<GUID>72BF0975EFFC3BBDC5F9C4DCB9683F2F</GUID>
822829
</Functions_Palette_Data>
823830
<Functions_Palette_Data>
824831
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -881,7 +888,7 @@ Felipe Pinheiro Silva (@felipefoz)
881888
<Path>subVIs\Run Tests Programmatically.vi</Path>
882889
<VI_Title/>
883890
</Items_Data>
884-
<GUID>61C3083BEA5D78BB3D482C96BC464469</GUID>
891+
<GUID>2FDFEEA44BE379C7131AFDBD5D3F8753</GUID>
885892
</Functions_Palette_Data>
886893
<Functions_Palette_Data>
887894
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -1070,7 +1077,7 @@ Felipe Pinheiro Silva (@felipefoz)
10701077
<Path>classes\Test Runner.Class\Setup TestRunner ClassInstance.vi</Path>
10711078
<VI_Title/>
10721079
</Items_Data>
1073-
<GUID>9568691324D21F22FAFD4722E8434A4D</GUID>
1080+
<GUID>99C1DAB4C732C9CF35FD531391944A75</GUID>
10741081
</Functions_Palette_Data>
10751082
<Functions_Palette_Data>
10761083
<Parent_Palette_Index>5</Parent_Palette_Index>
@@ -1301,7 +1308,7 @@ Felipe Pinheiro Silva (@felipefoz)
13011308
<Path>classes\Test Runner\Write Linkage Errors.vi</Path>
13021309
<VI_Title/>
13031310
</Items_Data>
1304-
<GUID>7B25E10730BD7710225C830B83309BF1</GUID>
1311+
<GUID>9B70F46B3B70F63E712C56E4732FDF16</GUID>
13051312
</Functions_Palette_Data>
13061313
<Functions_Palette_Data>
13071314
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -1434,7 +1441,7 @@ Felipe Pinheiro Silva (@felipefoz)
14341441
<Path>Advanced VI Tree - Caraya.vi</Path>
14351442
<VI_Title/>
14361443
</Items_Data>
1437-
<GUID>2A9BADC4B394E2E6B707628ECDF5AE2B</GUID>
1444+
<GUID>F3A3C8DC4F76014EC453C14DAB4DB5D2</GUID>
14381445
</Functions_Palette_Data>
14391446
<Functions_Palette_Data>
14401447
<Parent_Palette_Index>7</Parent_Palette_Index>
@@ -1511,7 +1518,7 @@ Felipe Pinheiro Silva (@felipefoz)
15111518
<Path>Advanced Reporting</Path>
15121519
<VI_Title/>
15131520
</Items_Data>
1514-
<GUID>A8841B9DF5533902EE0018C382DE9DCD</GUID>
1521+
<GUID>D8195D8D9273163BC1EE8270FDEE1F0C</GUID>
15151522
</Functions_Palette_Data>
15161523
<Functions_Palette_Data>
15171524
<Parent_Palette_Index>1</Parent_Palette_Index>
@@ -1588,7 +1595,7 @@ Felipe Pinheiro Silva (@felipefoz)
15881595
<Path>classes\Test Result\Get Node.vi</Path>
15891596
<VI_Title/>
15901597
</Items_Data>
1591-
<GUID>CDB67DA7A5AB84D6869E3EADFBD0DC56</GUID>
1598+
<GUID>2A0E0F5D8BC00B4D12FC841BBC69A4CD</GUID>
15921599
</Functions_Palette_Data>
15931600
</Library_Palette_Definition>
15941601
</VI_Package_Builder_Settings>

src/classes/Basic Test Manager/Basic Test Manager.lvclass

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,15 @@
287287
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
288288
<Property Name="NI.ClassItem.State" Type="Int">1082139136</Property>
289289
</Item>
290+
<Item Name="Rerun Tests.vi" Type="VI" URL="../Rerun Tests.vi">
291+
<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>
292+
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
293+
<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>
294+
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
295+
<Property Name="NI.ClassItem.MethodScope" Type="UInt">2</Property>
296+
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
297+
<Property Name="NI.ClassItem.State" Type="Int">1342710288</Property>
298+
</Item>
290299
</Item>
291300
<Item Name="Process.vi" Type="VI" URL="../Process.vi">
292301
<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>
-22.4 KB
Binary file not shown.
32 KB
Binary file not shown.
64 Bytes
Binary file not shown.
1.8 KB
Binary file not shown.

src/subVIs/Run Tests (Project).vi

-916 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)