From 581798e6346d3e41dbb28b9cd3c5a8a7a9632108 Mon Sep 17 00:00:00 2001 From: Michael Hagar Date: Fri, 29 Jun 2018 09:56:45 -0500 Subject: [PATCH] Update control ref tests to not reference dataItem --- test-it/ExpectedResults/ControlRefBasic.vtr | 12 +-- test-it/ViaTests/ControlRefBasic.via | 6 +- .../ControlRefNestedSubVIReadWrite.via | 2 +- .../propertynode/PropertyNodeRead.via | 32 ++++---- .../PropertyNodeReadUnwiredError.via | 30 +++---- .../propertynode/PropertyNodeWrite.via | 30 +++---- .../PropertyNodeWriteUnwiredError.via | 30 +++---- .../karma/fixtures/propertynode/ReadRead.via | 2 +- .../propertynode/TopVIControlRefSubVIRead.via | 6 +- .../TopVIControlRefSubVIWrite.via | 6 +- .../karma/fixtures/propertynode/WriteRead.via | 2 +- .../fixtures/propertynode/WriteWrite.via | 2 +- .../karma/propertynode/PropertyNode.Test.js | 78 +++++++++---------- .../PropertyNodeSequential.Test.js | 12 +-- .../propertynode/PropertyNodeSubSubVI.Test.js | 4 +- .../PropertyNodeUnwiredError.Test.js | 30 +++---- 16 files changed, 142 insertions(+), 142 deletions(-) diff --git a/test-it/ExpectedResults/ControlRefBasic.vtr b/test-it/ExpectedResults/ControlRefBasic.vtr index f86a59ef1..98d30b7db 100644 --- a/test-it/ExpectedResults/ControlRefBasic.vtr +++ b/test-it/ExpectedResults/ControlRefBasic.vtr @@ -1,20 +1,20 @@ -Ref ref1: ControlRefNum -Ref ref2: ControlRefNum +Ref ref1: ControlRefNum +Ref ref2: ControlRefNum IsEQ ref1 ref2: false IsNE ref1 ref2: true Ref ref4: ControlRefNum IsNotARefNum: true -Ref ref4: ControlRefNum +Ref ref4: ControlRefNum IsNotARefNum: false IsEQ ref1 ref2: true -Ref ref3 : ControlRefNum +Ref ref3 : ControlRefNum In SubVI: -Ref refarg: ControlRefNum +Ref refarg: ControlRefNum Ref subref: ControlRefNum In SubSubVI: Ref subsubref: ControlRefNum In SubVI: -Ref refarg: ControlRefNum +Ref refarg: ControlRefNum Ref subref: ControlRefNum In SubSubVI: Ref subsubref: ControlRefNum diff --git a/test-it/ViaTests/ControlRefBasic.via b/test-it/ViaTests/ControlRefBasic.via index b8cfb6ce9..5193d5574 100644 --- 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 index 53203fa56..cdf18651d 100644 --- 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 index 305060f36..c4609ab6f 100644 --- 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 index 10b07e7a4..438596904 100644 --- 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 index 87024deb8..fac31b2a3 100644 --- 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 index f954af5b7..482347bed 100644 --- 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 index 205dae18d..c7c052eb0 100644 --- 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 index 3931381ed..9e329a0bc 100644 --- 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 index 6d3594496..9f5f599b0 100644 --- 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 index c36761ac4..c316a3c2a 100644 --- 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 index e1a7647fe..2bb84dab6 100644 --- 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) diff --git a/test-it/karma/propertynode/PropertyNode.Test.js b/test-it/karma/propertynode/PropertyNode.Test.js index e49353af4..a9d9a2c68 100644 --- a/test-it/karma/propertynode/PropertyNode.Test.js +++ b/test-it/karma/propertynode/PropertyNode.Test.js @@ -62,24 +62,24 @@ describe('The Vireo PropertyNode', function () { it('when controlRef and property var are in the same top VI', function (done) { var expectedCallArgs = [ - [propertyReadVIName, 'dataItem_Boolean', propertyName, 'Boolean', propertyReadVIName, 'local_Boolean'], - [propertyReadVIName, 'dataItem_Int8', propertyName, 'Int8', propertyReadVIName, 'local_Int8'], - [propertyReadVIName, 'dataItem_Int16', propertyName, 'Int16', propertyReadVIName, 'local_Int16'], - [propertyReadVIName, 'dataItem_Int32', propertyName, 'Int32', propertyReadVIName, 'local_Int32'], - [propertyReadVIName, 'dataItem_Int64', propertyName, 'Int64', propertyReadVIName, 'local_Int64'], - [propertyReadVIName, 'dataItem_UInt8', propertyName, 'UInt8', propertyReadVIName, 'local_UInt8'], - [propertyReadVIName, 'dataItem_UInt16', propertyName, 'UInt16', propertyReadVIName, 'local_UInt16'], - [propertyReadVIName, 'dataItem_UInt32', propertyName, 'UInt32', propertyReadVIName, 'local_UInt32'], - [propertyReadVIName, 'dataItem_UInt64', propertyName, 'UInt64', propertyReadVIName, 'local_UInt64'], - [propertyReadVIName, 'dataItem_Single', propertyName, 'Single', propertyReadVIName, 'local_Single'], - [propertyReadVIName, 'dataItem_Double', propertyName, 'Double', propertyReadVIName, 'local_Double'], - [propertyReadVIName, 'dataItem_ComplexSingle', propertyName, 'ComplexSingle', propertyReadVIName, 'local_ComplexSingle'], - [propertyReadVIName, 'dataItem_ComplexDouble', propertyName, 'ComplexDouble', propertyReadVIName, 'local_ComplexDouble'], - [propertyReadVIName, 'dataItem_String', propertyName, 'String', propertyReadVIName, 'local_String'], - [propertyReadVIName, 'dataItem_Timestamp', propertyName, 'Timestamp', propertyReadVIName, 'local_Timestamp'], - [propertyReadVIName, 'dataItem_MíNúmero', propertyName, 'Double', propertyReadVIName, 'numberLocal'], - [propertyReadVIName, 'dataItem_MíNúmero', propertyName, 'Double', propertyReadVIName, 'clusterLocal.%3Anumeric%3A'], - [propertyReadVIName, 'dataItem_Boolean', propertyName, 'Boolean', propertyReadVIName, 'clusterLocal.nestedClusterLocal.Boolean%20Space%20Part'] + [propertyReadVIName, '1', propertyName, 'Boolean', propertyReadVIName, 'local_Boolean'], + [propertyReadVIName, '2', propertyName, 'Int8', propertyReadVIName, 'local_Int8'], + [propertyReadVIName, '3', propertyName, 'Int16', propertyReadVIName, 'local_Int16'], + [propertyReadVIName, '4', propertyName, 'Int32', propertyReadVIName, 'local_Int32'], + [propertyReadVIName, '5', propertyName, 'Int64', propertyReadVIName, 'local_Int64'], + [propertyReadVIName, '6', propertyName, 'UInt8', propertyReadVIName, 'local_UInt8'], + [propertyReadVIName, '7', propertyName, 'UInt16', propertyReadVIName, 'local_UInt16'], + [propertyReadVIName, '8', propertyName, 'UInt32', propertyReadVIName, 'local_UInt32'], + [propertyReadVIName, '9', propertyName, 'UInt64', propertyReadVIName, 'local_UInt64'], + [propertyReadVIName, '10', propertyName, 'Single', propertyReadVIName, 'local_Single'], + [propertyReadVIName, '11', propertyName, 'Double', propertyReadVIName, 'local_Double'], + [propertyReadVIName, '12', propertyName, 'ComplexSingle', propertyReadVIName, 'local_ComplexSingle'], + [propertyReadVIName, '13', propertyName, 'ComplexDouble', propertyReadVIName, 'local_ComplexDouble'], + [propertyReadVIName, '14', propertyName, 'String', propertyReadVIName, 'local_String'], + [propertyReadVIName, '15', propertyName, 'Timestamp', propertyReadVIName, 'local_Timestamp'], + [propertyReadVIName, '16', propertyName, 'Double', propertyReadVIName, 'numberLocal'], + [propertyReadVIName, '16', propertyName, 'Double', propertyReadVIName, 'clusterLocal.%3Anumeric%3A'], + [propertyReadVIName, '1', propertyName, 'Boolean', propertyReadVIName, 'clusterLocal.nestedClusterLocal.Boolean%20Space%20Part'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, publicApiPropertyNodeRead); runSlicesAsync(function (rawPrint, rawPrintError) { @@ -94,9 +94,9 @@ describe('The Vireo PropertyNode', function () { var topVIName = 'TopVI', subVIName = 'subVI'; var expectedCallArgs = [ - [topVIName, 'dataItem_Boolean', 'Value', 'Boolean', subVIName, 'booleanLocal'], - [topVIName, 'dataItem_String', 'Value', 'String', subVIName, 'stringLocal'], - [topVIName, 'dataItem_Double', 'Value', 'Double', subVIName, 'doubleLocal'] + [topVIName, '1', 'Value', 'Boolean', subVIName, 'booleanLocal'], + [topVIName, '2', 'Value', 'String', subVIName, 'stringLocal'], + [topVIName, '3', 'Value', 'Double', subVIName, 'doubleLocal'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, topVIControlRefReadViaUrl); runSlicesAsync(function (rawPrint, rawPrintError) { @@ -201,21 +201,21 @@ describe('The Vireo PropertyNode', function () { it('when controlRef and property var are in the same top VI', function (done) { var expectedCallArgs = [ - [propertyWriteVIName, 'dataItem_Boolean', propertyName, 'Boolean', propertyWriteVIName, 'local_Boolean'], - [propertyWriteVIName, 'dataItem_Int8', propertyName, 'Int8', propertyWriteVIName, 'local_Int8'], - [propertyWriteVIName, 'dataItem_Int16', propertyName, 'Int16', propertyWriteVIName, 'local_Int16'], - [propertyWriteVIName, 'dataItem_Int32', propertyName, 'Int32', propertyWriteVIName, 'local_Int32'], - [propertyWriteVIName, 'dataItem_Int64', propertyName, 'Int64', propertyWriteVIName, 'local_Int64'], - [propertyWriteVIName, 'dataItem_UInt8', propertyName, 'UInt8', propertyWriteVIName, 'local_UInt8'], - [propertyWriteVIName, 'dataItem_UInt16', propertyName, 'UInt16', propertyWriteVIName, 'local_UInt16'], - [propertyWriteVIName, 'dataItem_UInt32', propertyName, 'UInt32', propertyWriteVIName, 'local_UInt32'], - [propertyWriteVIName, 'dataItem_UInt64', propertyName, 'UInt64', propertyWriteVIName, 'local_UInt64'], - [propertyWriteVIName, 'dataItem_Single', propertyName, 'Single', propertyWriteVIName, 'local_Single'], - [propertyWriteVIName, 'dataItem_Double', propertyName, 'Double', propertyWriteVIName, 'local_Double'], - [propertyWriteVIName, 'dataItem_ComplexSingle', propertyName, 'ComplexSingle', propertyWriteVIName, 'local_ComplexSingle'], - [propertyWriteVIName, 'dataItem_ComplexDouble', propertyName, 'ComplexDouble', propertyWriteVIName, 'local_ComplexDouble'], - [propertyWriteVIName, 'dataItem_String', propertyName, 'String', propertyWriteVIName, 'local_String'], - [propertyWriteVIName, 'dataItem_Timestamp', propertyName, 'Timestamp', propertyWriteVIName, 'local_Timestamp'] + [propertyWriteVIName, '1', propertyName, 'Boolean', propertyWriteVIName, 'local_Boolean'], + [propertyWriteVIName, '2', propertyName, 'Int8', propertyWriteVIName, 'local_Int8'], + [propertyWriteVIName, '3', propertyName, 'Int16', propertyWriteVIName, 'local_Int16'], + [propertyWriteVIName, '4', propertyName, 'Int32', propertyWriteVIName, 'local_Int32'], + [propertyWriteVIName, '5', propertyName, 'Int64', propertyWriteVIName, 'local_Int64'], + [propertyWriteVIName, '6', propertyName, 'UInt8', propertyWriteVIName, 'local_UInt8'], + [propertyWriteVIName, '7', propertyName, 'UInt16', propertyWriteVIName, 'local_UInt16'], + [propertyWriteVIName, '8', propertyName, 'UInt32', propertyWriteVIName, 'local_UInt32'], + [propertyWriteVIName, '9', propertyName, 'UInt64', propertyWriteVIName, 'local_UInt64'], + [propertyWriteVIName, '10', propertyName, 'Single', propertyWriteVIName, 'local_Single'], + [propertyWriteVIName, '11', propertyName, 'Double', propertyWriteVIName, 'local_Double'], + [propertyWriteVIName, '12', propertyName, 'ComplexSingle', propertyWriteVIName, 'local_ComplexSingle'], + [propertyWriteVIName, '13', propertyName, 'ComplexDouble', propertyWriteVIName, 'local_ComplexDouble'], + [propertyWriteVIName, '14', propertyName, 'String', propertyWriteVIName, 'local_String'], + [propertyWriteVIName, '15', propertyName, 'Timestamp', propertyWriteVIName, 'local_Timestamp'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, publicApiPropertyNodeWrite); runSlicesAsync(function (rawPrint, rawPrintError) { @@ -230,9 +230,9 @@ describe('The Vireo PropertyNode', function () { var topVIName = 'TopVI', subVIName = 'subVI', expectedCallArgs = [ - [topVIName, 'dataItem_Boolean', 'Value', 'Boolean', subVIName, 'booleanLocal'], - [topVIName, 'dataItem_String', 'Value', 'String', subVIName, 'stringLocal'], - [topVIName, 'dataItem_Double', 'Value', 'Double', subVIName, 'doubleLocal'] + [topVIName, '1', 'Value', 'Boolean', subVIName, 'booleanLocal'], + [topVIName, '2', 'Value', 'String', subVIName, 'stringLocal'], + [topVIName, '3', 'Value', 'Double', subVIName, 'doubleLocal'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, topVIControlRefWriteViaUrl); runSlicesAsync(function (rawPrint, rawPrintError) { diff --git a/test-it/karma/propertynode/PropertyNodeSequential.Test.js b/test-it/karma/propertynode/PropertyNodeSequential.Test.js index 848627364..3cba95524 100644 --- a/test-it/karma/propertynode/PropertyNodeSequential.Test.js +++ b/test-it/karma/propertynode/PropertyNodeSequential.Test.js @@ -31,8 +31,8 @@ describe('The Vireo PropertyNode', function () { vireo.propertyNode.setPropertyReadFunction(spy); var expectedCallArgs = [ - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'local3'], - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'local6'] + [viName, '1', propertyName, 'Boolean', viName, 'local3'], + [viName, '1', propertyName, 'Boolean', viName, 'local6'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, propertyNodeReadRead); @@ -49,8 +49,8 @@ describe('The Vireo PropertyNode', function () { vireo.propertyNode.setPropertyWriteFunction(spy); var expectedCallArgs = [ - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'c1'], - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'c4'] + [viName, '1', propertyName, 'Boolean', viName, 'c1'], + [viName, '1', propertyName, 'Boolean', viName, 'c4'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, propertyNodeWriteWrite); @@ -68,8 +68,8 @@ describe('The Vireo PropertyNode', function () { vireo.propertyNode.setPropertyReadFunction(spy); var expectedCallArgs = [ - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'c1'], - [viName, 'dataItem_MyLED', propertyName, 'Boolean', viName, 'local6'] + [viName, '1', propertyName, 'Boolean', viName, 'c1'], + [viName, '1', propertyName, 'Boolean', viName, 'local6'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, propertyNodeWriteRead); diff --git a/test-it/karma/propertynode/PropertyNodeSubSubVI.Test.js b/test-it/karma/propertynode/PropertyNodeSubSubVI.Test.js index 4bab3ad77..f9cac21df 100644 --- a/test-it/karma/propertynode/PropertyNodeSubSubVI.Test.js +++ b/test-it/karma/propertynode/PropertyNodeSubSubVI.Test.js @@ -31,8 +31,8 @@ describe('The Vireo PropertyNode', function () { runSlicesAsync(function (rawPrint, rawPrintError) { expect(rawPrint).toBeEmptyString(); expect(rawPrintError).toBeEmptyString(); - expect(spyRead.calls.argsFor(0)).toEqual(['topVI', 'dataItem', 'Value', 'Double', 'subSubVI', 'doubleLocal']); - expect(spyWrite.calls.argsFor(0)).toEqual(['topVI', 'dataItem', 'Value', 'Double', 'subSubVI', 'doubleLocal']); + expect(spyRead.calls.argsFor(0)).toEqual(['topVI', '1', 'Value', 'Double', 'subSubVI', 'doubleLocal']); + expect(spyWrite.calls.argsFor(0)).toEqual(['topVI', '1', 'Value', 'Double', 'subSubVI', 'doubleLocal']); done(); }); }); diff --git a/test-it/karma/propertynode/PropertyNodeUnwiredError.Test.js b/test-it/karma/propertynode/PropertyNodeUnwiredError.Test.js index 7ebc0a4e7..ef061ad40 100644 --- a/test-it/karma/propertynode/PropertyNodeUnwiredError.Test.js +++ b/test-it/karma/propertynode/PropertyNodeUnwiredError.Test.js @@ -33,21 +33,21 @@ describe('The Vireo PropertyNode', function () { it('callback is invoked with no wired error terminal', function (done) { var expectedCallArgs = [ - [propertyReadVIName, 'dataItem_Boolean', propertyName, 'Boolean', propertyReadVIName, 'local_Boolean'], - [propertyReadVIName, 'dataItem_Int8', propertyName, 'Int8', propertyReadVIName, 'local_Int8'], - [propertyReadVIName, 'dataItem_Int16', propertyName, 'Int16', propertyReadVIName, 'local_Int16'], - [propertyReadVIName, 'dataItem_Int32', propertyName, 'Int32', propertyReadVIName, 'local_Int32'], - [propertyReadVIName, 'dataItem_Int64', propertyName, 'Int64', propertyReadVIName, 'local_Int64'], - [propertyReadVIName, 'dataItem_UInt8', propertyName, 'UInt8', propertyReadVIName, 'local_UInt8'], - [propertyReadVIName, 'dataItem_UInt16', propertyName, 'UInt16', propertyReadVIName, 'local_UInt16'], - [propertyReadVIName, 'dataItem_UInt32', propertyName, 'UInt32', propertyReadVIName, 'local_UInt32'], - [propertyReadVIName, 'dataItem_UInt64', propertyName, 'UInt64', propertyReadVIName, 'local_UInt64'], - [propertyReadVIName, 'dataItem_Single', propertyName, 'Single', propertyReadVIName, 'local_Single'], - [propertyReadVIName, 'dataItem_Double', propertyName, 'Double', propertyReadVIName, 'local_Double'], - [propertyReadVIName, 'dataItem_ComplexSingle', propertyName, 'ComplexSingle', propertyReadVIName, 'local_ComplexSingle'], - [propertyReadVIName, 'dataItem_ComplexDouble', propertyName, 'ComplexDouble', propertyReadVIName, 'local_ComplexDouble'], - [propertyReadVIName, 'dataItem_String', propertyName, 'String', propertyReadVIName, 'local_String'], - [propertyReadVIName, 'dataItem_Timestamp', propertyName, 'Timestamp', propertyReadVIName, 'local_Timestamp'] + [propertyReadVIName, '1', propertyName, 'Boolean', propertyReadVIName, 'local_Boolean'], + [propertyReadVIName, '2', propertyName, 'Int8', propertyReadVIName, 'local_Int8'], + [propertyReadVIName, '3', propertyName, 'Int16', propertyReadVIName, 'local_Int16'], + [propertyReadVIName, '4', propertyName, 'Int32', propertyReadVIName, 'local_Int32'], + [propertyReadVIName, '5', propertyName, 'Int64', propertyReadVIName, 'local_Int64'], + [propertyReadVIName, '6', propertyName, 'UInt8', propertyReadVIName, 'local_UInt8'], + [propertyReadVIName, '7', propertyName, 'UInt16', propertyReadVIName, 'local_UInt16'], + [propertyReadVIName, '8', propertyName, 'UInt32', propertyReadVIName, 'local_UInt32'], + [propertyReadVIName, '9', propertyName, 'UInt64', propertyReadVIName, 'local_UInt64'], + [propertyReadVIName, '10', propertyName, 'Single', propertyReadVIName, 'local_Single'], + [propertyReadVIName, '11', propertyName, 'Double', propertyReadVIName, 'local_Double'], + [propertyReadVIName, '12', propertyName, 'ComplexSingle', propertyReadVIName, 'local_ComplexSingle'], + [propertyReadVIName, '13', propertyName, 'ComplexDouble', propertyReadVIName, 'local_ComplexDouble'], + [propertyReadVIName, '14', propertyName, 'String', propertyReadVIName, 'local_String'], + [propertyReadVIName, '15', propertyName, 'Timestamp', propertyReadVIName, 'local_Timestamp'] ]; runSlicesAsync = vireoRunner.rebootAndLoadVia(vireo, publicApiPropertyNodeRead);