epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

use getSubField

Browse Source
This commit is contained in:
Michael Davidsaver
2015-06-22 15:04:44 -04:00
parent 63ebdce9dd
commit ef46931276
8 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
testApp/remote/channelAccessIFTest.cpp
View File

@@ -549,11 +549,11 @@ void ChannelAccessIFTest::test_channelGetIntProcessInternal(Channel::shared_poin
return;
}
std::tr1::shared_ptr<PVInt> value = channelGetReq->getPVStructure()->getIntField("value");
std::tr1::shared_ptr<PVInt> value = channelGetReq->getPVStructure()->getSubField<PVInt>("value");
PVTimeStamp pvTimeStamp;
testOk(pvTimeStamp.attach(channelGetReq->getPVStructure()->getStructureField("timeStamp")),
testOk(pvTimeStamp.attach(channelGetReq->getPVStructure()->getSubField<PVStructure>("timeStamp")),
"%s: attaching a timestamp", testMethodName.c_str());
TimeStamp timeStamp;
@@ -679,7 +679,7 @@ void ChannelAccessIFTest::test_channelPutNoProcess() {
return;
}
std::tr1::shared_ptr<PVDouble> value = channelPutReq->getPVStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> value = channelPutReq->getPVStructure()->getSubField<PVDouble>("value");
if (!value.get()) {
testFail("%s: getting double value field failed ", CURRENT_FUNCTION);
return;
@@ -818,7 +818,7 @@ void ChannelAccessIFTest::test_channelPutIntProcessInternal(Channel::shared_poin
return;
}
std::tr1::shared_ptr<PVInt> value = channelPutReq->getPVStructure()->getIntField("value");
std::tr1::shared_ptr<PVInt> value = channelPutReq->getPVStructure()->getSubField<PVInt>("value");
if (!value.get()) {
testFail("%s: getting int value field failed ", testMethodName.c_str());
return;
@@ -1213,7 +1213,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_putGet() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@@ -1222,7 +1222,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_putGet() {
double initVal = 321.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@@ -1292,7 +1292,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getPut() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@@ -1301,7 +1301,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getPut() {
double initVal = 321.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@@ -1369,7 +1369,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getGet() {
}
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVDouble>("value");
if (!putValue.get()) {
testFail("%s: getting put double value field failed ", CURRENT_FUNCTION);
return;
@@ -1378,7 +1378,7 @@ void ChannelAccessIFTest::test_channelPutGetNoProcess_getGet() {
double initVal = 432.0;
putValue->put(initVal);
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getDoubleField("value");
std::tr1::shared_ptr<PVDouble> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVDouble>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get double value field failed ", CURRENT_FUNCTION);
return;
@@ -1505,7 +1505,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
}
std::tr1::shared_ptr<PVInt> putValue = channelPutGetReq->getPVPutStructure()->getIntField("value");
std::tr1::shared_ptr<PVInt> putValue = channelPutGetReq->getPVPutStructure()->getSubField<PVInt>("value");
if (!putValue.get()) {
testFail("%s: getting put int value field failed ", CURRENT_FUNCTION);
return;
@@ -1514,7 +1514,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
int initVal = 3;
putValue->put(initVal);
std::tr1::shared_ptr<PVInt> getValuePtr = channelPutGetReq->getPVGetStructure()->getIntField("value");
std::tr1::shared_ptr<PVInt> getValuePtr = channelPutGetReq->getPVGetStructure()->getSubField<PVInt>("value");
if (!getValuePtr.get()) {
testFail("%s: getting get int value field failed ", CURRENT_FUNCTION);
return;
@@ -1522,7 +1522,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
PVTimeStamp pvTimeStamp;
testOk(pvTimeStamp.attach(channelPutGetReq->getPVGetStructure()->getStructureField("timeStamp")),
testOk(pvTimeStamp.attach(channelPutGetReq->getPVGetStructure()->getSubField<PVStructure>("timeStamp")),
"%s: attaching a timestamp", CURRENT_FUNCTION);
TimeStamp timeStamp;
@@ -1597,7 +1597,7 @@ void ChannelAccessIFTest::test_channelRPC() {
createSumArgumentStructure(1,2),false, getTimeoutSec());
if (succStatus) {
testOk(true, "%s: calling sum rpc service successfull", CURRENT_FUNCTION);
testOk(channelRPCReq->getLastResponse()->getIntField("c")->get() == 3,
testOk(channelRPCReq->getLastResponse()->getSubField<PVInt>("c")->get() == 3,
"%s: rpc service returned correct sum", CURRENT_FUNCTION);
}
else {
@@ -2329,8 +2329,8 @@ PVStructure::shared_pointer ChannelAccessIFTest::createSumArgumentStructure(int
getPVDataCreate()->createPVStructure(
getFieldCreate()->createStructure(fieldNames, fields)));
pvArguments->getIntField("a")->put(a);
pvArguments->getIntField("b")->put(b);
pvArguments->getSubField<PVInt>("a")->put(a);
pvArguments->getSubField<PVInt>("b")->put(b);
return pvArguments;
@@ -2344,7 +2344,7 @@ PVStructure::shared_pointer ChannelAccessIFTest::createArrayPvRequest() {
PVStructure::shared_pointer pvRequest(getPVDataCreate()->createPVStructure(
getFieldCreate()->createStructure(fieldNames, fields)));
PVString::shared_pointer pvFieldName = pvRequest->getStringField("field");
PVString::shared_pointer pvFieldName = pvRequest->getSubField<PVString>("field");
pvFieldName->put("value");
return pvRequest;
}