Update control ref tests to not reference dataItem

ni · Jul 2, 2018 · 581798e · 581798e
1 parent 4d29169
commit 581798e
Show file tree

Hide file tree

Showing 16 changed files with 142 additions and 142 deletions.
diff --git a/test-it/ExpectedResults/ControlRefBasic.vtr b/test-it/ExpectedResults/ControlRefBasic.vtr
@@ -1,20 +1,20 @@
-Ref ref1: ControlRefNum<ControlRefTestProgram,dataItem1>
-Ref ref2: ControlRefNum<ControlRefTestProgram,dataItem2>
+Ref ref1: ControlRefNum<ControlRefTestProgram,1>
+Ref ref2: ControlRefNum<ControlRefTestProgram,2>
 IsEQ ref1 ref2: false
 IsNE ref1 ref2: true
 Ref ref4: ControlRefNum
 IsNotARefNum: true
-Ref ref4: ControlRefNum<ControlRefTestProgram,dataItem1>
+Ref ref4: ControlRefNum<ControlRefTestProgram,1>
 IsNotARefNum: false
 IsEQ ref1 ref2: true
-Ref ref3 : ControlRefNum<ControlRefTestProgram,dataItem3>
+Ref ref3 : ControlRefNum<ControlRefTestProgram,3>
 In SubVI:
-Ref refarg: ControlRefNum<ControlRefTestProgram,dataItem1>
+Ref refarg: ControlRefNum<ControlRefTestProgram,1>
 Ref subref: ControlRefNum<subVI,myItem>
 In SubSubVI:
 Ref subsubref: ControlRefNum<subSubVI,nestedRef>
 In SubVI:
-Ref refarg: ControlRefNum<ControlRefTestProgram,dataItem2>
+Ref refarg: ControlRefNum<ControlRefTestProgram,2>
 Ref subref: ControlRefNum<subVI,myItem>
 In SubSubVI:
 Ref subsubref: ControlRefNum<subSubVI,nestedRef>
diff --git a/test-it/ViaTests/ControlRefBasic.via b/test-it/ViaTests/ControlRefBasic.via
@@ -55,9 +55,9 @@ define(ControlRefTestProgram dv(.VirtualInstrument (
      )) // End Event Struct 1
     )
     Locals:c(
-        e(ControlReference("dataItem1") ref1)  // static control ref linked to dataItem1
-        e(dv(ControlReference("dataItem2")) ref2)  // static control ref linked to dataItem2
-        e(dv(ControlRefNum ControlReference("dataItem3")) ref3)  // more verbose with explicit type and dv definition
+        e(ControlReference("1") ref1)  // static control ref linked to dataItem1
+        e(dv(ControlReference("2")) ref2)  // static control ref linked to dataItem2
+        e(dv(ControlRefNum ControlReference("3")) ref3)  // more verbose with explicit type and dv definition
 	e(ControlRefNum ref4)  // variable control refnum wire
 	e(Boolean bool)
     )

diff --git a/test-it/karma/fixtures/propertynode/ControlRefNestedSubVIReadWrite.via b/test-it/karma/fixtures/propertynode/ControlRefNestedSubVIReadWrite.via
@@ -30,7 +30,7 @@ define(subVI dv(.VirtualInstrument (
 
 define(topVI dv(.VirtualInstrument (
     Locals: c(
-        e(dv(ControlRefNum ControlReference("dataItem")) ref)
+        e(dv(ControlRefNum ControlReference("1")) ref)
     )
 
     clump (1

diff --git a/test-it/karma/fixtures/propertynode/PropertyNodeRead.via b/test-it/karma/fixtures/propertynode/PropertyNodeRead.via
@@ -31,23 +31,23 @@ define (%3AWeb%20Server%3AInteractive%3AWebApp%3AMain%2Egviweb dv(.VirtualInstru
             e(.String source)
         ) error)
 
-        e(dv(ControlRefNum ControlReference("dataItem_Boolean")) BooleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Int8")) Int8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int16")) Int16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int32")) Int32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int64")) Int64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt8")) UInt8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt16")) UInt16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt32")) UInt32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt64")) UInt64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Single")) SingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) DoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexSingle")) ComplexSingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexDouble")) ComplexDoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) StringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Timestamp")) TimestampRef)
+        e(dv(ControlRefNum ControlReference("1")) BooleanRef)
+        e(dv(ControlRefNum ControlReference("2")) Int8Ref)
+        e(dv(ControlRefNum ControlReference("3")) Int16Ref)
+        e(dv(ControlRefNum ControlReference("4")) Int32Ref)
+        e(dv(ControlRefNum ControlReference("5")) Int64Ref)
+        e(dv(ControlRefNum ControlReference("6")) UInt8Ref)
+        e(dv(ControlRefNum ControlReference("7")) UInt16Ref)
+        e(dv(ControlRefNum ControlReference("8")) UInt32Ref)
+        e(dv(ControlRefNum ControlReference("9")) UInt64Ref)
+        e(dv(ControlRefNum ControlReference("10")) SingleRef)
+        e(dv(ControlRefNum ControlReference("11")) DoubleRef)
+        e(dv(ControlRefNum ControlReference("12")) ComplexSingleRef)
+        e(dv(ControlRefNum ControlReference("13")) ComplexDoubleRef)
+        e(dv(ControlRefNum ControlReference("14")) StringRef)
+        e(dv(ControlRefNum ControlReference("15")) TimestampRef)
 
-        e(dv(ControlRefNum ControlReference("dataItem_MíNúmero")) numberRef)
+        e(dv(ControlRefNum ControlReference("16")) numberRef)
     )
         clump(1
 

diff --git a/test-it/karma/fixtures/propertynode/PropertyNodeReadUnwiredError.via b/test-it/karma/fixtures/propertynode/PropertyNodeReadUnwiredError.via
@@ -17,21 +17,21 @@ define (%3AWeb%20Server%3AInteractive%3AWebApp%3AMain%2Egviweb dv(.VirtualInstru
         e(.String local_String)
         e(.Timestamp local_Timestamp)
 
-        e(dv(ControlRefNum ControlReference("dataItem_Boolean")) BooleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Int8")) Int8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int16")) Int16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int32")) Int32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int64")) Int64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt8")) UInt8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt16")) UInt16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt32")) UInt32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt64")) UInt64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Single")) SingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) DoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexSingle")) ComplexSingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexDouble")) ComplexDoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) StringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Timestamp")) TimestampRef)
+        e(dv(ControlRefNum ControlReference("1")) BooleanRef)
+        e(dv(ControlRefNum ControlReference("2")) Int8Ref)
+        e(dv(ControlRefNum ControlReference("3")) Int16Ref)
+        e(dv(ControlRefNum ControlReference("4")) Int32Ref)
+        e(dv(ControlRefNum ControlReference("5")) Int64Ref)
+        e(dv(ControlRefNum ControlReference("6")) UInt8Ref)
+        e(dv(ControlRefNum ControlReference("7")) UInt16Ref)
+        e(dv(ControlRefNum ControlReference("8")) UInt32Ref)
+        e(dv(ControlRefNum ControlReference("9")) UInt64Ref)
+        e(dv(ControlRefNum ControlReference("10")) SingleRef)
+        e(dv(ControlRefNum ControlReference("11")) DoubleRef)
+        e(dv(ControlRefNum ControlReference("12")) ComplexSingleRef)
+        e(dv(ControlRefNum ControlReference("13")) ComplexDoubleRef)
+        e(dv(ControlRefNum ControlReference("14")) StringRef)
+        e(dv(ControlRefNum ControlReference("15")) TimestampRef)
     )
         clump(1
 

diff --git a/test-it/karma/fixtures/propertynode/PropertyNodeWrite.via b/test-it/karma/fixtures/propertynode/PropertyNodeWrite.via
@@ -30,21 +30,21 @@ define (MyVI dv(.VirtualInstrument (
             e(.String source)
         ) error)
 
-	    e(dv(ControlRefNum ControlReference("dataItem_Boolean")) BooleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Int8")) Int8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int16")) Int16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int32")) Int32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int64")) Int64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt8")) UInt8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt16")) UInt16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt32")) UInt32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt64")) UInt64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Single")) SingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) DoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexSingle")) ComplexSingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexDouble")) ComplexDoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) StringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Timestamp")) TimestampRef)
+	    e(dv(ControlRefNum ControlReference("1")) BooleanRef)
+        e(dv(ControlRefNum ControlReference("2")) Int8Ref)
+        e(dv(ControlRefNum ControlReference("3")) Int16Ref)
+        e(dv(ControlRefNum ControlReference("4")) Int32Ref)
+        e(dv(ControlRefNum ControlReference("5")) Int64Ref)
+        e(dv(ControlRefNum ControlReference("6")) UInt8Ref)
+        e(dv(ControlRefNum ControlReference("7")) UInt16Ref)
+        e(dv(ControlRefNum ControlReference("8")) UInt32Ref)
+        e(dv(ControlRefNum ControlReference("9")) UInt64Ref)
+        e(dv(ControlRefNum ControlReference("10")) SingleRef)
+        e(dv(ControlRefNum ControlReference("11")) DoubleRef)
+        e(dv(ControlRefNum ControlReference("12")) ComplexSingleRef)
+        e(dv(ControlRefNum ControlReference("13")) ComplexDoubleRef)
+        e(dv(ControlRefNum ControlReference("14")) StringRef)
+        e(dv(ControlRefNum ControlReference("15")) TimestampRef)
     )
         clump(1
             PropertyNodeWrite(BooleanRef "Value" local_Boolean error)

diff --git a/test-it/karma/fixtures/propertynode/PropertyNodeWriteUnwiredError.via b/test-it/karma/fixtures/propertynode/PropertyNodeWriteUnwiredError.via
@@ -24,21 +24,21 @@ define (MyVI dv(.VirtualInstrument (
         e(dv(.String 'Dolor amet sit amet' ) local_String)
         e(dv(.Timestamp (3564057536 7811758927381448193) ) local_Timestamp)
 
-	    e(dv(ControlRefNum ControlReference("dataItem_Boolean")) BooleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Int8")) Int8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int16")) Int16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int32")) Int32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Int64")) Int64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt8")) UInt8Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt16")) UInt16Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt32")) UInt32Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_UInt64")) UInt64Ref)
-        e(dv(ControlRefNum ControlReference("dataItem_Single")) SingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) DoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexSingle")) ComplexSingleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_ComplexDouble")) ComplexDoubleRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) StringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Timestamp")) TimestampRef)
+	    e(dv(ControlRefNum ControlReference("1")) BooleanRef)
+        e(dv(ControlRefNum ControlReference("2")) Int8Ref)
+        e(dv(ControlRefNum ControlReference("3")) Int16Ref)
+        e(dv(ControlRefNum ControlReference("4")) Int32Ref)
+        e(dv(ControlRefNum ControlReference("5")) Int64Ref)
+        e(dv(ControlRefNum ControlReference("6")) UInt8Ref)
+        e(dv(ControlRefNum ControlReference("7")) UInt16Ref)
+        e(dv(ControlRefNum ControlReference("8")) UInt32Ref)
+        e(dv(ControlRefNum ControlReference("9")) UInt64Ref)
+        e(dv(ControlRefNum ControlReference("10")) SingleRef)
+        e(dv(ControlRefNum ControlReference("11")) DoubleRef)
+        e(dv(ControlRefNum ControlReference("12")) ComplexSingleRef)
+        e(dv(ControlRefNum ControlReference("13")) ComplexDoubleRef)
+        e(dv(ControlRefNum ControlReference("14")) StringRef)
+        e(dv(ControlRefNum ControlReference("15")) TimestampRef)
     )
         clump(1
             PropertyNodeWrite(BooleanRef "Value" local_Boolean * )

diff --git a/test-it/karma/fixtures/propertynode/ReadRead.via b/test-it/karma/fixtures/propertynode/ReadRead.via
@@ -4,7 +4,7 @@
 //VI Definition: ::Web Server::Interactive::WebApp::ReadRead.gviweb
 define (%3A%3AWeb%20Server%3A%3AInteractive%3A%3AWebApp%3A%3AReadRead%2Egviweb dv(.VirtualInstrument (
     Locals: c(   // Data Space
-        e(dv(.ControlRefNum ControlReference("dataItem_MyLED"))local0)
+        e(dv(.ControlRefNum ControlReference("1"))local0)
         e(.ControlRefNum local1)
         e(.ErrorCluster local2)
         e(.Boolean local3)

diff --git a/test-it/karma/fixtures/propertynode/TopVIControlRefSubVIRead.via b/test-it/karma/fixtures/propertynode/TopVIControlRefSubVIRead.via
@@ -27,9 +27,9 @@ define(subVI dv(.VirtualInstrument (
 
 define(TopVI dv(.VirtualInstrument (
     Locals: c(
-        e(dv(ControlRefNum ControlReference("dataItem_Boolean")) booleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) stringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) doubleRef)
+        e(dv(ControlRefNum ControlReference("1")) booleanRef)
+        e(dv(ControlRefNum ControlReference("2")) stringRef)
+        e(dv(ControlRefNum ControlReference("3")) doubleRef)
     )
 
     clump (1

diff --git a/test-it/karma/fixtures/propertynode/TopVIControlRefSubVIWrite.via b/test-it/karma/fixtures/propertynode/TopVIControlRefSubVIWrite.via
@@ -27,9 +27,9 @@ define(subVI dv(.VirtualInstrument (
 
 define(TopVI dv(.VirtualInstrument (
     Locals: c(
-        e(dv(ControlRefNum ControlReference("dataItem_Boolean")) booleanRef)
-        e(dv(ControlRefNum ControlReference("dataItem_String")) stringRef)
-        e(dv(ControlRefNum ControlReference("dataItem_Double")) doubleRef)
+        e(dv(ControlRefNum ControlReference("1")) booleanRef)
+        e(dv(ControlRefNum ControlReference("2")) stringRef)
+        e(dv(ControlRefNum ControlReference("3")) doubleRef)
     )
 
     clump (1

diff --git a/test-it/karma/fixtures/propertynode/WriteRead.via b/test-it/karma/fixtures/propertynode/WriteRead.via
@@ -4,7 +4,7 @@
 //VI Definition: ::Web Server::Interactive::WebApp::WriteRead.gviweb
 define (%3A%3AWeb%20Server%3A%3AInteractive%3A%3AWebApp%3A%3AWriteRead%2Egviweb dv(.VirtualInstrument (
     Locals: c(   // Data Space
-        e(dv(.ControlRefNum ControlReference("dataItem_MyLED"))local0)
+        e(dv(.ControlRefNum ControlReference("1"))local0)
         ce(dv(.Boolean true)c1)
         e(.ControlRefNum local2)
         e(.ErrorCluster local3)

diff --git a/test-it/karma/fixtures/propertynode/WriteWrite.via b/test-it/karma/fixtures/propertynode/WriteWrite.via
@@ -4,7 +4,7 @@
 //VI Definition: ::Web Server::Interactive::WebApp::WriteWrite.gviweb
 define (%3A%3AWeb%20Server%3A%3AInteractive%3A%3AWebApp%3A%3AWriteWrite%2Egviweb dv(.VirtualInstrument (
     Locals: c(   // Data Space
-        e(dv(.ControlRefNum ControlReference("dataItem_MyLED"))local0)
+        e(dv(.ControlRefNum ControlReference("1"))local0)
         ce(dv(.Boolean true)c1)
         e(.ControlRefNum local2)
         e(.ErrorCluster local3)