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

merge

Browse Source
This commit is contained in:
Matej Sekoranja
2011-01-24 23:28:31 +01:00
parent 8dbc67377c 29ae6bb531
commit 228ed56858
5 changed files with 27 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
testApp/utils/configurationTest.cpp
View File

@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
assert(doubleProperty == 42);
if(configuration) delete configuration;
if(configProvider) delete configProvider;
getShowConstructDestruct()->constuctDestructTotals(stdout);
return 0;
}

11
testApp/utils/introspectionRegistryTest.cpp
View File

@@ -89,7 +89,7 @@ ScalarArrayConstPtr getScalarArray(string name)
StructureConstPtr getStructure(string name)
{
String properties("alarm");
FieldConstPtr powerSupply[3];
FieldConstPtrArray powerSupply = new FieldConstPtr[3];
powerSupply[0] = standardField->scalar(
String("voltage"),pvDouble,properties);
powerSupply[1] = standardField->scalar(
@@ -97,7 +97,7 @@ StructureConstPtr getStructure(string name)
powerSupply[2] = standardField->scalar(
String("current"),pvDouble,properties);
StructureConstPtr structure = standardField->structure(name,3,powerSupply);
PVField * pvField = pvDataCreate->createPVField(0,structure);
PVField *pvField = pvDataCreate->createPVField(0,structure);
pvFieldArray.push_back(pvField);
return structure;
}
@@ -105,7 +105,7 @@ StructureConstPtr getStructure(string name)
StructureArrayConstPtr getStructureArray(string name1, string name2)
{
String properties("alarm");
FieldConstPtr powerSupply[3];
FieldConstPtrArray powerSupply = new FieldConstPtr[3];
powerSupply[0] = standardField->scalar(
String("voltage"),pvDouble,properties);
powerSupply[1] = standardField->scalar(
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
statusCreate = getStatusCreate();
fieldCreate = getFieldCreate();
standardField = getStandardField();
cout << "DONE1" << endl;
flusher = new SerializableControlImpl();
control = new DeserializableControlImpl();
@@ -420,7 +420,6 @@ int main(int argc, char *argv[])
clientRegistry = new IntrospectionRegistry(false);
serverRegistry = new IntrospectionRegistry(true);
testRegistryPutGet();
testRegistryReset();
testSerialize();
@@ -444,7 +443,7 @@ int main(int argc, char *argv[])
if(clientRegistry) delete clientRegistry;
if(serverRegistry) delete serverRegistry;
getShowConstructDestruct()->showDeleteStaticExit(stdout);
getShowConstructDestruct()->showDeleteStaticExit(stdout);
cout << "DONE" << endl;
return 0;
}