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

FieldBuilder: better method names

Browse Source
This commit is contained in:
Matej Sekoranja
2013-11-11 22:36:06 +01:00
parent ac67fddbcb
commit 47178370d5
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testApp/misc/testSerialization.cpp
+4 -4
View File
@@ -189,11 +189,11 @@ void testEquals() {
UnionConstPtr punion = getFieldCreate()->createFieldBuilder()->
add("double", pvDouble)->
add("double2", pvDouble)->
addStructureArray("nested")->
addNestedStructureArray("nested")->
setId("nestedId")->
add("short", pvShort)->
add("long", pvLong)->
createNested()->
addNested()->
addArray("intArray", pvInt)->
createUnion();
PVUnionPtr union1 = factory->createPVUnion(punion);
@@ -683,11 +683,11 @@ void testIntrospectionSerialization()
// union
UnionConstPtr punion = factory->createFieldBuilder()->
add("double", pvDouble)->
addStructureArray("nested")->
addNestedStructureArray("nested")->
setId("nestedId")->
add("short", pvShort)->
add("long", pvLong)->
createNested()->
addNested()->
addArray("intArray", pvInt)->
createUnion();
serializatioTest(punion);
testApp/pv/testFieldBuilder.cpp
+8 -8
View File
@@ -86,19 +86,19 @@ void test_invalid()
{
fieldCreate->createFieldBuilder()->
add("f1", pvByte)->
createNested();
testFail("createNested() allowed in non-nested FieldBuilder");
addNested();
testFail("addNested() allowed in non-nested FieldBuilder");
}
catch (std::runtime_error& re) {
// ok
testPass("createNested() disallowed in non-nested FieldBuilder");
testPass("addNested() disallowed in non-nested FieldBuilder");
}
try
{
fieldCreate->createFieldBuilder()->
add("f1", pvByte)->
addStructure("nested")->
addNestedStructure("nested")->
add("n1", pvUInt)->
createStructure();
testFail("createStructure() allowed in nested FieldBuilder");
@@ -119,11 +119,11 @@ void test_nestedStructure()
std::string NESTED_ID = "nestedID";
StructureConstPtr s = fieldCreate->createFieldBuilder()->
add("double", pvDouble)->
addStructure("nested")->
addNestedStructure("nested")->
setId(NESTED_ID)->
add("short", pvShort)->
add("long", pvLong)->
createNested()->
addNested()->
addArray("intArray", pvInt)->
createStructure();
testOk1(s.get() != 0);
@@ -175,11 +175,11 @@ void test_nestedStructureArray()
std::string NESTED_ID = "nestedID";
StructureConstPtr s = fieldCreate->createFieldBuilder()->
add("double", pvDouble)->
addStructureArray("nested")->
addNestedStructureArray("nested")->
setId(NESTED_ID)->
add("short", pvShort)->
add("long", pvLong)->
createNested()->
addNested()->
addArray("intArray", pvInt)->
createStructure();
testOk1(s.get() != 0);