Skip to content

Commit

Permalink
fix tests wrt. userTag
Browse files Browse the repository at this point in the history
  • Loading branch information
mdavidsaver committed Jun 30, 2021
1 parent db1f6e9 commit bf6282d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 6 additions & 2 deletions testApp/testpdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ void testSingleMonitor(pvac::ClientProvider& client)
.set(mon.root->getSubFieldT("alarm.status")->getFieldOffset())
.set(mon.root->getSubFieldT("alarm.message")->getFieldOffset())
.set(mon.root->getSubFieldT("timeStamp.secondsPastEpoch")->getFieldOffset())
.set(mon.root->getSubFieldT("timeStamp.nanoseconds")->getFieldOffset()));
.set(mon.root->getSubFieldT("timeStamp.nanoseconds")->getFieldOffset())
.set(mon.root->getSubFieldT("timeStamp.userTag")->getFieldOffset()));

testFieldEqual<pvd::PVDouble>(mon.root, "value", 11.0);

Expand Down Expand Up @@ -220,7 +221,8 @@ void testGroupMonitor(pvac::ClientProvider& client)
.set(mon.root->getSubFieldT("fld1.alarm.status")->getFieldOffset())
.set(mon.root->getSubFieldT("fld1.alarm.message")->getFieldOffset())
.set(mon.root->getSubFieldT("fld1.timeStamp.secondsPastEpoch")->getFieldOffset())
.set(mon.root->getSubFieldT("fld1.timeStamp.nanoseconds")->getFieldOffset()));
.set(mon.root->getSubFieldT("fld1.timeStamp.nanoseconds")->getFieldOffset())
.set(mon.root->getSubFieldT("fld1.timeStamp.userTag")->getFieldOffset()));

testFieldEqual<pvd::PVDouble>(mon.root, "fld1.value", 32.0);
#else
Expand Down Expand Up @@ -273,12 +275,14 @@ void testGroupMonitorTriggers(pvac::ClientProvider& client)
.set(OFF("fld1.alarm.message"))
.set(OFF("fld1.timeStamp.secondsPastEpoch"))
.set(OFF("fld1.timeStamp.nanoseconds"))
.set(OFF("fld1.timeStamp.userTag"))
.set(OFF("fld2.value"))
.set(OFF("fld2.alarm.severity"))
.set(OFF("fld2.alarm.status"))
.set(OFF("fld2.alarm.message"))
.set(OFF("fld2.timeStamp.secondsPastEpoch"))
.set(OFF("fld2.timeStamp.nanoseconds"))
.set(OFF("fld2.timeStamp.userTag"))
);
#undef OFF

Expand Down
8 changes: 5 additions & 3 deletions testApp/testpvif.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ void testScalar()
.set(OFF("li.alarm.message"))
.set(OFF("li.timeStamp.secondsPastEpoch"))
.set(OFF("li.timeStamp.nanoseconds"))
.set(OFF("li.timeStamp.userTag"))
.set(OFF("li.display.limitHigh"))
.set(OFF("li.display.limitLow"))
.set(OFF("li.display.description"))
Expand Down Expand Up @@ -175,6 +176,7 @@ void testScalar()
.set(OFF("i64.alarm.message"))
.set(OFF("i64.timeStamp.secondsPastEpoch"))
.set(OFF("i64.timeStamp.nanoseconds"))
.set(OFF("i64.timeStamp.userTag"))
.set(OFF("i64.display.limitHigh"))
.set(OFF("i64.display.limitLow"))
.set(OFF("i64.display.description"))
Expand Down Expand Up @@ -207,7 +209,7 @@ void testScalar()
.set(OFF("si.alarm.message"))
.set(OFF("si.timeStamp.secondsPastEpoch"))
.set(OFF("si.timeStamp.nanoseconds"))
//.set(OFF("si.timeStamp.userTag"))
.set(OFF("si.timeStamp.userTag"))
.set(OFF("si.display.limitHigh"))
.set(OFF("si.display.limitLow"))
.set(OFF("si.display.description"))
Expand Down Expand Up @@ -235,7 +237,7 @@ void testScalar()
.set(OFF("ai.alarm.message"))
.set(OFF("ai.timeStamp.secondsPastEpoch"))
.set(OFF("ai.timeStamp.nanoseconds"))
//.set(OFF("ai.timeStamp.userTag"))
.set(OFF("ai.timeStamp.userTag"))
.set(OFF("ai.display.limitHigh"))
.set(OFF("ai.display.limitLow"))
.set(OFF("ai.display.description"))
Expand All @@ -254,7 +256,7 @@ void testScalar()
.set(OFF("ai_rval.alarm.message"))
.set(OFF("ai_rval.timeStamp.secondsPastEpoch"))
.set(OFF("ai_rval.timeStamp.nanoseconds"))
//.set(OFF("ai_rval.timeStamp.userTag"))
.set(OFF("ai_rval.timeStamp.userTag"))
.set(OFF("ai_rval.display.limitHigh"))
.set(OFF("ai_rval.display.limitLow"))
.set(OFF("ai_rval.display.description"))
Expand Down

0 comments on commit bf6282d

Please sign in to comment.