Merge branch 'hotfix/CompareWithTypedef'

vipm-io · Jan 13, 2019 · f7d3db4 · f7d3db4
2 parents 2777400 + 85d1f2e
commit f7d3db4
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 3 deletions.
diff --git a/src/Caraya.lvproj b/src/Caraya.lvproj
@@ -40,12 +40,14 @@
 				<Item Name="Test Assert False.vi" Type="VI" URL="../tests/asserts/Test Assert False.vi"/>
 				<Item Name="Test Assert Equal Value and Type.vi" Type="VI" URL="../tests/asserts/Test Assert Equal Value and Type.vi"/>
 				<Item Name="Test Assert Equal Value.vi" Type="VI" URL="../tests/asserts/Test Assert Equal Value.vi"/>
+				<Item Name="Test Assert Equal Value (Typedef).vi" Type="VI" URL="../tests/asserts/Test Assert Equal Value (Typedef).vi"/>
 				<Item Name="Test Assert Equal Type.vi" Type="VI" URL="../tests/asserts/Test Assert Equal Type.vi"/>
 				<Item Name="Test Assert Equal Value (Arrays).vi" Type="VI" URL="../tests/asserts/Test Assert Equal Value (Arrays).vi"/>
 				<Item Name="Test Assert Almost Equal (Float).vi" Type="VI" URL="../tests/asserts/Test Assert Almost Equal (Float).vi"/>
 				<Item Name="Test Assert Equal (Float Units).vi" Type="VI" URL="../tests/asserts/Test Assert Equal (Float Units).vi"/>
 				<Item Name="Test Assert Not Equal Value and Type.vi" Type="VI" URL="../tests/asserts/Test Assert Not Equal Value and Type.vi"/>
 				<Item Name="Test Assert Not Equal Value.vi" Type="VI" URL="../tests/asserts/Test Assert Not Equal Value.vi"/>
+				<Item Name="Test Assert Not Equal Value (Typedef).vi" Type="VI" URL="../tests/asserts/Test Assert Not Equal Value (Typedef).vi"/>
 				<Item Name="Test Assert Not Equal Type.vi" Type="VI" URL="../tests/asserts/Test Assert Not Equal Type.vi"/>
 				<Item Name="Test Assert Equal - deprecated.vi" Type="VI" URL="../tests/asserts/Test Assert Equal - deprecated.vi"/>
 				<Item Name="Test Assert Not Equal - deprecated.vi" Type="VI" URL="../tests/asserts/Test Assert Not Equal - deprecated.vi"/>
@@ -405,6 +407,9 @@
 				<Item Name="Strip Path Extension - Path__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Strip Path Extension - Path__ogtk.vi"/>
 				<Item Name="Strip Path Extension - 1D Array of Paths__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Strip Path Extension - 1D Array of Paths__ogtk.vi"/>
 				<Item Name="Strip Path Extension - 1D Array of Strings__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/file/file.llb/Strip Path Extension - 1D Array of Strings__ogtk.vi"/>
+				<Item Name="Split Cluster TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Split Cluster TD__ogtk.vi"/>
+				<Item Name="Cluster to Array of VData__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Cluster to Array of VData__ogtk.vi"/>
+				<Item Name="Parse String with TDs__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Parse String with TDs__ogtk.vi"/>
 			</Item>
 			<Item Name="property -- cluster.ctl" Type="VI" URL="../classes/Test Report.JUnit/property -- cluster.ctl"/>
 			<Item Name="Call Chain To Indent.vi" Type="VI" URL="../classes/Test Report.JUnit/Call Chain To Indent.vi"/>

diff --git a/src/classes/Assert/Assert (Poly).vi b/src/classes/Assert/Assert (Poly).vi
diff --git a/src/classes/Assert/Assert Equal Value and Type_Variant.vi b/src/classes/Assert/Assert Equal Value and Type_Variant.vi
diff --git a/src/classes/Assert/Assert Equal Value_Variant.vi b/src/classes/Assert/Assert Equal Value_Variant.vi
diff --git a/src/classes/Assert/Assert Not Equal Value_Variant.vi b/src/classes/Assert/Assert Not Equal Value_Variant.vi
diff --git a/src/classes/Assert/Assert.lvclass b/src/classes/Assert/Assert.lvclass
@@ -58,6 +58,15 @@
 			<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
 			<Property Name="NI.ClassItem.State" Type="Int">1342710288</Property>
 		</Item>
+		<Item Name="Disconnect TypeDef.vi" Type="VI" URL="../../../subVIs/Disconnect TypeDef.vi">
+			<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">#1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!!Y!!!!!Q!11&amp;-,6G&amp;S;7&amp;O&gt;#"0&gt;81!$%"4"V:B=GFB&lt;H1!&amp;!$Q!!)!!!!"!Q!!#!U"#A!!!!!"!!)!!!!!</Property>
+			<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
+			<Property Name="NI.ClassItem.Flags" Type="Int">160</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">8388624</Property>
+		</Item>
 		<Item Name="Equal Value Comparison.vi" Type="VI" URL="../../../subVIs/Equal Value Comparison.vi">
 			<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">#1#!!!!!!!)!"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!"!!!!"*!)1V&amp;=86B&lt;#"797RV:8-`!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!"E"4!6E!"E"4!6A!0!$Q!!Q!!Q!%!!5!"!!%!!1!"!!%!!9!"Q!)!!1$!!"Y$1A!!!E!!!!!!!!!!!!!!!I!#A!+!!!!!!!!!1!*!!!!!!</Property>
 			<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
@@ -158,7 +167,7 @@
 		<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
 		<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
 		<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-		<Property Name="NI.ClassItem.State" Type="Int">1342714384</Property>
+		<Property Name="NI.ClassItem.State" Type="Int">1107821074</Property>
 	</Item>
 	<Item Name="Assert Equal Type_Variant.vi" Type="VI" URL="../Assert Equal Type_Variant.vi">
 		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">#1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!$K!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!":!)2""=X.F=H1A4WZM?4]A+%9J!!!61!-!$G6S=G^S)'.P:'5A+$%J!!!/1$$`````"5RB9G6M!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!"E"4!6E!"E"4!6A!0!$Q!!Q!!Q!%!!1!"!!%!!5!"A!(!!A!"!!*!!I$!!"Y$1A!!!!!!!!!!!)!!A!+!!I!!!!3!")!!!!!!1!,!!!!!!</Property>
@@ -190,11 +199,11 @@
 	<Item Name="Assert Not Equal Value_Variant.vi" Type="VI" URL="../Assert Not Equal Value_Variant.vi">
 		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">#1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!$K!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!":!)2""=X.F=H1A4WZM?4]A+%9J!!!61!-!$G6S=G^S)'.P:'5A+$%J!!!/1$$`````"5RB9G6M!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!"E"4!6E!"E"4!6A!0!$Q!!Q!!Q!%!!1!"!!%!!5!"A!(!!A!"!!*!!I$!!"Y$1A!!!!!!!!!!!)!!A!+!!I!!!!3!")!!!!!!1!,!!!!!!</Property>
 		<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
-		<Property Name="NI.ClassItem.Flags" Type="Int">16777218</Property>
+		<Property Name="NI.ClassItem.Flags" Type="Int">16777216</Property>
 		<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
 		<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
 		<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
-		<Property Name="NI.ClassItem.State" Type="Int">1074541072</Property>
+		<Property Name="NI.ClassItem.State" Type="Int">1107821072</Property>
 	</Item>
 	<Item Name="Assert Not Equal Type_Variant.vi" Type="VI" URL="../Assert Not Equal Type_Variant.vi">
 		<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">#1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!$K!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!":!)2""=X.F=H1A4WZM?4]A+%9J!!!61!-!$G6S=G^S)'.P:'5A+$%J!!!/1$$`````"5RB9G6M!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!"E"4!6E!"E"4!6A!0!$Q!!Q!!Q!%!!1!"!!%!!5!"A!(!!A!"!!*!!I$!!"Y$1A!!!!!!!!!!!)!!A!+!!I!!!!3!")!!!!!!1!,!!!!!!</Property>

diff --git a/src/classes/Assert/Test Asserts.vi b/src/classes/Assert/Test Asserts.vi
diff --git a/src/subVIs/Disconnect TypeDef.vi b/src/subVIs/Disconnect TypeDef.vi
diff --git a/src/subVIs/Equal Value Comparison.vi b/src/subVIs/Equal Value Comparison.vi
diff --git a/src/tests/asserts/Test Assert Equal (Float Units).vi b/src/tests/asserts/Test Assert Equal (Float Units).vi
diff --git a/src/tests/asserts/Test Assert Equal Value (Arrays).vi b/src/tests/asserts/Test Assert Equal Value (Arrays).vi
diff --git a/src/tests/asserts/Test Assert Equal Value (Typedef).vi b/src/tests/asserts/Test Assert Equal Value (Typedef).vi
diff --git a/src/tests/asserts/Test Assert Equal Value and Type.vi b/src/tests/asserts/Test Assert Equal Value and Type.vi
diff --git a/src/tests/asserts/Test Assert Equal Value.vi b/src/tests/asserts/Test Assert Equal Value.vi
diff --git a/src/tests/asserts/Test Assert Not Equal Value (Typedef).vi b/src/tests/asserts/Test Assert Not Equal Value (Typedef).vi
diff --git a/src/tests/asserts/Test Assert Not Equal Value.vi b/src/tests/asserts/Test Assert Not Equal Value.vi