fixup tests

This commit is contained in:
Michael Davidsaver
2016-05-04 19:46:19 -04:00
parent 7f077efe39
commit 3c7cd0fab4
5 changed files with 10 additions and 7 deletions

View File

@@ -343,7 +343,7 @@ struct TestMonitor {
MAIN(testmon)
{
testPlan(0);
testPlan(79);
TEST_METHOD(TestMonitor, test_event);
TEST_METHOD(TestMonitor, test_share);
TEST_METHOD(TestMonitor, test_ds_no_start);

View File

@@ -363,7 +363,8 @@ void testGroupMonitor(const PDBProvider::shared_pointer& prov)
e = mon.poll();
testOk1(!!e);
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{2, 4, 5, 8, 9}");
testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld1.value")->getFieldOffset()==6);
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{6, 8, 9, 12, 13}");
else testFail("oops");
testFieldEqual<pvd::PVDouble>(e, "fld1.value", 32.0);
@@ -410,7 +411,9 @@ void testGroupMonitorTriggers(const PDBProvider::shared_pointer& prov)
e = mon.poll();
testOk1(!!e);
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{2, 4, 5, 8, 9, 42, 44, 45, 48, 49}");
testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld1.value")->getFieldOffset()==6);
testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld2.value")->getFieldOffset()==46);
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{6, 8, 9, 12, 13, 46, 48, 49, 52, 53}");
else testFail("oops");
testFieldEqual<pvd::PVDouble>(e, "fld1.value", 15.0);
@@ -428,7 +431,7 @@ void p2pTestIoc_registerRecordDeviceDriver(struct dbBase *);
MAIN(testpdb)
{
testPlan(0);
testPlan(137);
try{
TestIOC IOC;

View File

@@ -194,7 +194,7 @@ void testScalar()
MAIN(testpvif)
{
testPlan(0);
testPlan(56);
PVIF::Init();
testScalar();
return testDone();

View File

@@ -78,7 +78,7 @@ static const char longmsg[] = "This message should be longer than the mimimum bu
MAIN(teststream)
{
testPlan(0);
testPlan(10);
eltc(0);
testNoBlock("hello");
testNoBlock(longmsg);

View File

@@ -172,7 +172,7 @@ void testmonitor()
MAIN(testtest)
{
testPlan(0);
testPlan(46);
testmonitor();
TestProvider::testCounts();
return testDone();