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

FieldBuilder::add() ignore exact duplicates

Browse Source
This commit is contained in:
Michael Davidsaver
2017-09-20 18:47:42 -05:00
parent 9bce66f307
commit 822173979c
3 changed files with 27 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testApp/pv/testFieldBuilder.cpp
+11 -18
View File
@@ -273,6 +273,7 @@ void test_extendStructure()
->addNestedStructure("nest")
->add("B2", pvInt)
->addNestedStructure("one")
->add("XX", pvInt) // exact duplicate silently ignored
->add("YY", pvInt)
->endNested()
->endNested()
@@ -327,25 +328,17 @@ void test_extendStructure()
static_cast<const void*>(expected.get()));
testEqual(*amended, *expected);
try {
Structure::const_shared_pointer Z(getFieldCreate()->createFieldBuilder(amended)
->add("A2", pvDouble)
->createStructure());
testFail("Unexpected success in adding duplicate field");
}catch(std::exception& e){
testPass("catch expected exception: %s", e.what());
}
testThrows(std::runtime_error,
getFieldCreate()->createFieldBuilder(amended)
->add("A2", pvDouble)
->createStructure());
try {
Structure::const_shared_pointer Z(getFieldCreate()->createFieldBuilder(amended)
->addNestedStructure("nest")
->add("B2", pvDouble)
->endNested()
->createStructure());
testFail("Unexpected success in adding duplicate nested field");
}catch(std::exception& e){
testPass("catch expected exception: %s", e.what());
}
testThrows(std::runtime_error,
getFieldCreate()->createFieldBuilder(amended)
->addNestedStructure("nest")
->add("B2", pvDouble)
->endNested()
->createStructure());
}
} // namespace