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

Merge pull request #47 from anjohnson/master

Browse Source 
Improve test robustness (was failing on a Mac VM)
This commit is contained in:
Matej Sekoranja
2016-04-22 08:31:33 +02:00
parent bde691f6b6 0884a199b3
commit 13bb108120
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
testApp/remote/channelAccessIFTest.cpp
View File

@@ -621,7 +621,7 @@ void ChannelAccessIFTest::test_channelGetIntProcessInternal(Channel::shared_poin
for (int i = 0; i < numOfTimes; i++) {
int previousValue = value->get();
long previousTimestampSec = timeStamp.getSecondsPastEpoch();
TimeStamp previousTimestamp = timeStamp;
epicsThreadSleep(1.0);
@@ -632,11 +632,12 @@ void ChannelAccessIFTest::test_channelGetIntProcessInternal(Channel::shared_poin
}
pvTimeStamp.get(timeStamp);
double deltaT = TimeStamp::diff(timeStamp, previousTimestamp);
testOk((previousValue +1)/*%11*/ == value->get(), "%s: testing the counter value change",
testMethodName.c_str());
testOk(timeStamp.getSecondsPastEpoch() > previousTimestampSec,
"%s: testing the timestamp change", testMethodName.c_str());
testOk(deltaT > 0.9 && deltaT < 2.0,
"%s: timestamp change was %g", testMethodName.c_str(), deltaT);
}
channelGetReq->getChannelGet()->destroy();
@@ -1590,7 +1591,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
for (int i = 0; i < numOfTimes; i++) {
int previousValue = getValuePtr->get();
long previousTimestampSec = timeStamp.getSecondsPastEpoch();
TimeStamp previousTimestamp = timeStamp;
//cout << "previousValue:" << previousValue << " previousTimestampSec:" << previousTimestampSec << endl;
//cout << "next val:" << ((previousValue +1) % 11) << endl;
@@ -1607,6 +1608,7 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
epicsThreadSleep(1.0);
pvTimeStamp.get(timeStamp);
double deltaT = TimeStamp::diff(timeStamp, previousTimestamp);
int testValue = (previousValue +1 + 1) /*% 11*/; //+1 (new value) +1 (process)
@@ -1614,8 +1616,8 @@ void ChannelAccessIFTest::test_channelPutGetIntProcess() {
//cout << "Testing2:" << timeStamp.getSecondsPastEpoch() << ">" << previousTimestampSec << endl;
testOk( testValue == getValuePtr->get(), "%s: testing the counter value change",
CURRENT_FUNCTION);
testOk(timeStamp.getSecondsPastEpoch() > previousTimestampSec,
"%s: testing the timestamp change", CURRENT_FUNCTION);
testOk(deltaT > 0.9 && deltaT < 2.0,
"%s: timestamp change is %g", CURRENT_FUNCTION, deltaT);
}
channel->destroy();